SOURCES: ruby-vendordir.patch (NEW) - added
aredridel
aredridel at pld-linux.org
Tue Feb 20 09:41:15 CET 2007
Author: aredridel Date: Tue Feb 20 08:41:15 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- added
---- Files affected:
SOURCES:
ruby-vendordir.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/ruby-vendordir.patch
diff -u /dev/null SOURCES/ruby-vendordir.patch:1.1
--- /dev/null Tue Feb 20 09:41:15 2007
+++ SOURCES/ruby-vendordir.patch Tue Feb 20 09:41:10 2007
@@ -0,0 +1,208 @@
+diff -ur ruby-1.8.6-preview1-o/configure.in ruby-1.8.6-preview1/configure.in
+--- ruby-1.8.6-preview1-o/configure.in 2007-02-20 01:02:11.000000000 -0700
++++ ruby-1.8.6-preview1/configure.in 2007-02-20 01:05:18.000000000 -0700
+@@ -1586,9 +1586,28 @@
+ AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
+ AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+
++AC_ARG_WITH(vendordir,
++ [ --with-vendordir=DIR vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]],
++ [vendordir=$withval],
++ [vendordir='${libdir}/ruby/vendor_ruby'])
++VENDOR_DIR="`eval \"echo ${vendordir}\"`"
++case "$target_os" in
++ cygwin*|mingw*|*djgpp*|os2_emx*)
++ RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" ||
++ RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
++ *)
++ RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
++esac
++RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
++
++AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
++AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
++
+ AC_SUBST(arch)dnl
+ AC_SUBST(sitearch)dnl
++AC_SUBST(vendorarch)dnl
+ AC_SUBST(sitedir)dnl
++AC_SUBST(vendordir)dnl
+
+ configure_args=$ac_configure_args
+ AC_SUBST(configure_args)dnl
+@@ -1601,6 +1620,8 @@
+
+ AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
+ "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
++ AC_DEFINE_UNQUOTED(RUBY_VENDOR_THIN_ARCHLIB,
++ "${RUBY_VENDOR_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+ AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
+ else
+ arch="${target_cpu}-${target_os}"
+@@ -1608,12 +1629,15 @@
+ fi
+
+ case "$target_os" in
+- mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
+- *) sitearch="${arch}" ;;
++ mingw*) sitearch="i386-$rb_cv_msvcrt"
++ vendorarch="i386-$rb_cv_msvcrt" ;;
++ *) sitearch="${arch}"
++ vendorarch="${arch}" ;;
+ esac
+
+ AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
+ AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
++AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${RUBY_VENDOR_LIB_PATH2}/${vendorarch}")
+
+ AC_ARG_WITH(search-path,
+ [ --with-search-path=DIR specify the additional search path],
+diff -ur ruby-1.8.6-preview1-o/configure.in.orig ruby-1.8.6-preview1/configure.in.orig
+--- ruby-1.8.6-preview1-o/configure.in.orig 2007-02-12 16:01:19.000000000 -0700
++++ ruby-1.8.6-preview1/configure.in.orig 2007-02-20 01:02:11.000000000 -0700
+@@ -1563,7 +1563,7 @@
+ RUBY_LIB_PREFIX="/lib/ruby"
+ ;;
+ *)
+- RUBY_LIB_PREFIX="${prefix}/lib/ruby"
++ RUBY_LIB_PREFIX="${libdir}/ruby"
+ ;;
+ esac
+ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+diff -ur ruby-1.8.6-preview1-o/instruby.rb ruby-1.8.6-preview1/instruby.rb
+--- ruby-1.8.6-preview1-o/instruby.rb 2007-02-20 01:02:48.000000000 -0700
++++ ruby-1.8.6-preview1/instruby.rb 2007-02-20 01:08:36.000000000 -0700
+@@ -162,6 +162,8 @@
+ archlibdir = CONFIG["archdir"]
+ sitelibdir = CONFIG["sitelibdir"]
+ sitearchlibdir = CONFIG["sitearchdir"]
++vendorlibdir = CONFIG["vendorlibdir"]
++vendorarchlibdir = CONFIG["vendorarchdir"]
+ mandir = File.join(CONFIG["mandir"], "man")
+ configure_args = Shellwords.shellwords(CONFIG["configure_args"])
+ enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
+@@ -202,7 +204,7 @@
+ extout = "#$extout"
+ install?(:ext, :arch, :'ext-arch') do
+ puts "installing extension objects"
+- makedirs [archlibdir, sitearchlibdir]
++ makedirs [archlibdir, sitearchlibdir, vendorarchlibdir]
+ if noinst = CONFIG["no_install_files"] and noinst.empty?
+ noinst = nil
+ end
+@@ -210,7 +212,7 @@
+ end
+ install?(:ext, :comm, :'ext-comm') do
+ puts "installing extension scripts"
+- makedirs [rubylibdir, sitelibdir]
++ makedirs [rubylibdir, sitelibdir, vendorlibdir]
+ install_recursive("#{extout}/common", rubylibdir)
+ end
+ end
+Only in ruby-1.8.6-preview1: instruby.rb~
+Only in ruby-1.8.6-preview1: instruby.rb.orig
+Only in ruby-1.8.6-preview1: instruby.rb.rej~
+diff -ur ruby-1.8.6-preview1-o/lib/mkmf.rb ruby-1.8.6-preview1/lib/mkmf.rb
+--- ruby-1.8.6-preview1-o/lib/mkmf.rb 2007-02-20 01:02:13.000000000 -0700
++++ ruby-1.8.6-preview1/lib/mkmf.rb 2007-02-20 01:12:00.000000000 -0700
+@@ -51,6 +51,9 @@
+ $sitedir = CONFIG["sitedir"]
+ $sitelibdir = CONFIG["sitelibdir"]
+ $sitearchdir = CONFIG["sitearchdir"]
++$vendordir = CONFIG["vendordir"]
++$vendorlibdir = CONFIG["vendorlibdir"]
++$vendorarchdir = CONFIG["vendorarchdir"]
+
+ $mswin = /mswin/ =~ RUBY_PLATFORM
+ $bccwin = /bccwin/ =~ RUBY_PLATFORM
+@@ -410,7 +413,7 @@
+
+ def try_func(func, libs, headers = nil, &b)
+ headers = cpp_include(headers)
+- try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
++ try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
+ #{COMMON_HEADERS}
+ #{headers}
+ /*top*/
+@@ -422,6 +425,11 @@
+ int main() { return 0; }
+ int t() { #{func}(); return 0; }
+ SRC
++int #{func}();
++/*top*/
++int main() { return 0; }
++int t() { #{func}(); return 0; }
++SRC
+ end
+
+ def try_var(var, headers = nil, &b)
+@@ -1087,6 +1095,7 @@
+ RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
+ arch = #{CONFIG['arch']}
+ sitearch = #{CONFIG['sitearch']}
++vendorarch = #{CONFIG['vendorarch']}
+ ruby_version = #{Config::CONFIG['ruby_version']}
+ ruby = #{$ruby}
+ RUBY = $(ruby#{sep})
+Only in ruby-1.8.6-preview1/lib: mkmf.rb~
+diff -ur ruby-1.8.6-preview1-o/lib/mkmf.rb.orig ruby-1.8.6-preview1/lib/mkmf.rb.orig
+--- ruby-1.8.6-preview1-o/lib/mkmf.rb.orig 2007-02-12 16:01:19.000000000 -0700
++++ ruby-1.8.6-preview1/lib/mkmf.rb.orig 2007-02-20 01:02:13.000000000 -0700
+@@ -276,7 +276,7 @@
+ 'LDFLAGS' => "#$LDFLAGS #{ldflags}",
+ 'LIBPATH' => libpathflag(libpath),
+ 'LOCAL_LIBS' => "#$LOCAL_LIBS #$libs",
+- 'LIBS' => "#$LIBRUBYARG_STATIC #{opt} #$LIBS"))
++ 'LIBS' => "#$LIBRUBYARG_SHARED #{opt} #$LIBS"))
+ end
+
+ def cc_command(opt="")
+diff -ur ruby-1.8.6-preview1-o/Makefile.in ruby-1.8.6-preview1/Makefile.in
+--- ruby-1.8.6-preview1-o/Makefile.in 2007-02-12 16:01:19.000000000 -0700
++++ ruby-1.8.6-preview1/Makefile.in 2007-02-20 01:05:18.000000000 -0700
+@@ -24,6 +24,8 @@
+ arch = @arch@
+ sitearch = @sitearch@
+ sitedir = @sitedir@
++vendorarch = @vendorarch@
++vendordir = @vendordir@
+
+ TESTUI = console
+ TESTS =
+Only in ruby-1.8.6-preview1: Makefile.in.orig
+diff -ur ruby-1.8.6-preview1-o/mkconfig.rb ruby-1.8.6-preview1/mkconfig.rb
+--- ruby-1.8.6-preview1-o/mkconfig.rb 2007-02-20 01:02:48.000000000 -0700
++++ ruby-1.8.6-preview1/mkconfig.rb 2007-02-20 01:05:18.000000000 -0700
+@@ -139,6 +139,14 @@
+ CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
+ CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
+ CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
++ CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
++ CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(vendorarch)"
++ if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
++ CONFIG["sitearch"] = CONFIG["vendorarch"]
++ CONFIG["sitedir"] = CONFIG["vendordir"]
++ CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
++ CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
++ end
+ CONFIG["topdir"] = File.dirname(__FILE__)
+ MAKEFILE_CONFIG = {}
+ CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
+Only in ruby-1.8.6-preview1: mkconfig.rb.orig
+diff -ur ruby-1.8.6-preview1-o/ruby.c ruby-1.8.6-preview1/ruby.c
+--- ruby-1.8.6-preview1-o/ruby.c 2007-02-12 16:01:19.000000000 -0700
++++ ruby-1.8.6-preview1/ruby.c 2007-02-20 01:05:18.000000000 -0700
+@@ -298,6 +298,13 @@
+ ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
+ ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+
++ ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
++#ifdef RUBY_VENDOR_THIN_ARCHLIB
++ ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB));
++#endif
++ ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB));
++ ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB));
++
+ ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
+ #ifdef RUBY_THIN_ARCHLIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
================================================================
More information about the pld-cvs-commit
mailing list