[packages/ruby] cleanup unused patches; renum patches
glen
glen at pld-linux.org
Thu Jul 17 16:17:58 CEST 2014
commit 313c55d4be464751381a70cf99cee124d76c7b0d
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jul 17 15:35:00 2014 +0300
cleanup unused patches; renum patches
arch-specific-dir.patch | 132 ---------------------------
disable-versioned-paths.patch | 149 -------------------------------
ruby.spec | 30 +++----
site-and-vendor-arch-flags.patch | 188 ---------------------------------------
4 files changed, 10 insertions(+), 489 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 38a3de8..dfa6dce 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -64,20 +64,13 @@ Source6: operating_system.rb
Patch0: %{oname}-lib64.patch
Patch1: %{oname}-ffs.patch
Patch2: fix-bison-invocation.patch
-# http://redmine.ruby-lang.org/issues/5231
-#Patch3: disable-versioned-paths.patch
-# TODO: Should be submitted upstream?
-#Patch4: arch-specific-dir.patch
-# http://redmine.ruby-lang.org/issues/5281
-#Patch5: site-and-vendor-arch-flags.patch
-# Make mkmf verbose by default
-Patch6: mkmf-verbose.patch
-Patch7: strip-ccache.patch
-Patch8: duplicated-paths.patch
-Patch9: DESTDIR.patch
-Patch10: empty-ruby-version.patch
-Patch11: rubygems-2.0.0-binary-extensions.patch
-Patch12: custom-rubygems-location.patch
+Patch3: mkmf-verbose.patch
+Patch4: strip-ccache.patch
+Patch5: duplicated-paths.patch
+Patch6: DESTDIR.patch
+Patch7: empty-ruby-version.patch
+Patch8: rubygems-2.0.0-binary-extensions.patch
+Patch9: custom-rubygems-location.patch
URL: http://www.ruby-lang.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -430,16 +423,13 @@ Biblioteka JSON dla języka Ruby.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
# must be regenerated with new bison
%{__rm} parse.{c,h}
diff --git a/arch-specific-dir.patch b/arch-specific-dir.patch
deleted file mode 100644
index 8440ea7..0000000
--- a/arch-specific-dir.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From df4253a5b79b63f16f215f2c19f1b9666c4ca01e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
-Date: Thu, 8 Sep 2011 15:30:05 +0200
-Subject: [PATCH] Add configuration arch specific dir flag.
-
----
- Makefile.in | 1 +
- configure.in | 20 ++++++++++++++++++++
- tool/mkconfig.rb | 4 +++-
- version.c | 2 ++
- 4 files changed, 26 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index bcdaf5f..d61b2ee 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -31,6 +31,7 @@ libexecdir = @libexecdir@
- datarootdir = @datarootdir@
- datadir = @datadir@
- arch = @arch@
-+archdir = @archdir@
- sitearch = @sitearch@
- sitedir = @sitedir@
- ruby_version = @ruby_version@
-diff --git a/configure.in b/configure.in
-index 83e5d76..e6dc38c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2793,6 +2793,15 @@ else
- RUBY_LIB_VERSION="\"${ruby_version}\""
- fi
-
-+AC_ARG_WITH(archdir,
-+ AS_HELP_STRING([--with-archdir=DIR], [architecture specific ruby libraries [[LIBDIR/RUBY_BASE_NAME/ARCH]]]),
-+ [archdir=$withval],
-+ [archdir='${rubylibprefix}/${arch}'])
-+dir="${archdir}"
-+until ARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${ARCH_DIR}"; do
-+ dir="${ARCH_DIR}"
-+done
-+
- AC_ARG_WITH(sitedir,
- AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]]]),
- [sitedir=$withval],
-@@ -2815,16 +2824,25 @@ if test "${LOAD_RELATIVE+set}"; then
- AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
- RUBY_EXEC_PREFIX=""
- RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-+ RUBY_ARCH_LIB_PATH="`eval echo "$ARCH_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
- RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
- RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
- else
- RUBY_EXEC_PREFIX="`eval echo \\"$exec_prefix/\\" | sed 's|^NONE/|'"$prefix"'/|;s|/$||'`"
- RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-+ RUBY_ARCH_LIB_PATH="`eval echo \\"$ARCH_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
- RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
- RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
- fi
-
- pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)'
-+AS_CASE(["$RUBY_ARCH_LIB_PATH"],
-+ ["$RUBY_LIB_PREFIX/"*], [
-+ RUBY_ARCH_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_ARCH_LIB_PATH\" : \"$pat\"`"'"'
-+ ],
-+ [
-+ RUBY_ARCH_LIB_PATH="\"${RUBY_ARCH_LIB_PATH}\""
-+ ])
- AS_CASE(["$RUBY_SITE_LIB_PATH"],
- ["$RUBY_LIB_PREFIX/"*], [
- RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"'
-@@ -2855,6 +2873,7 @@ else
- fi
- AC_DEFINE_UNQUOTED(RUBY_EXEC_PREFIX, "${RUBY_EXEC_PREFIX}")
- AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, ${RUBY_LIB_PREFIX})
-+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, ${RUBY_ARCH_LIB_PATH})
- if test "x$SITE_DIR" = xno; then
- AC_DEFINE(NO_RUBY_SITE_LIB)
- else
-@@ -2869,6 +2888,7 @@ fi
- AC_SUBST(arch)dnl
- AC_SUBST(sitearch)dnl
- AC_SUBST(ruby_version)dnl
-+AC_SUBST(archdir)dnl
- AC_SUBST(sitedir)dnl
- AC_SUBST(vendordir)dnl
-
-diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
-index b707c4b..9780ef2 100755
---- a/tool/mkconfig.rb
-+++ b/tool/mkconfig.rb
-@@ -43,6 +43,7 @@ v_others = []
- continued_name = nil
- continued_line = nil
- path_version = "/$(ruby_version)"
-+archdir_override = "$(vendorlibdir)/$(sitearch)"
- File.foreach "config.status" do |line|
- next if /^#/ =~ line
- name = nil
-@@ -77,6 +78,7 @@ File.foreach "config.status" do |line|
- when /^RUBY_INSTALL_NAME$/; next if $install_name
- when /^RUBY_SO_NAME$/; next if $so_name
- when /^arch$/; if val.empty? then val = arch else arch = val end
-+ when /^archdir$/; archdir_override = val; next
- when /^sitearch/; val = '$(arch)' if val.empty?
- end
- case val
-@@ -207,7 +209,7 @@ print(*v_fast)
- print(*v_others)
- print <<EOS
- CONFIG["rubylibdir"] = "$(rubylibprefix)#{path_version}"
-- CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-+ CONFIG["archdir"] = "#{archdir_override}"
- EOS
- print <<EOS unless v_disabled["sitedir"]
- CONFIG["sitelibdir"] = "$(sitedir)#{path_version}"
-diff --git a/version.c b/version.c
-index 59d4e5e..915a0a2 100644
---- a/version.c
-+++ b/version.c
-@@ -47,7 +47,9 @@
- #define RUBY_SITE_LIB2 RUBY_SITE_LIB "/"RUBY_LIB_VERSION
- #define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB "/"RUBY_LIB_VERSION
- #endif
-+#ifndef RUBY_ARCHLIB
- #define RUBY_ARCHLIB RUBY_LIB "/"RUBY_ARCH
-+#endif
- #define RUBY_SITE_ARCHLIB RUBY_SITE_LIB2 "/"RUBY_SITEARCH
- #define RUBY_VENDOR_ARCHLIB RUBY_VENDOR_LIB2 "/"RUBY_SITEARCH
- #ifdef RUBY_THINARCH
---
-1.7.6.1
-
diff --git a/disable-versioned-paths.patch b/disable-versioned-paths.patch
deleted file mode 100644
index 1d0bfea..0000000
--- a/disable-versioned-paths.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From fa1a50ad10814f724b8713865dc222724cb955ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
-Date: Thu, 25 Aug 2011 14:33:51 +0200
-Subject: [PATCH] Allow to disable versioned paths.
-
----
- configure.in | 11 +++++++++++
- tool/mkconfig.rb | 9 ++++++---
- version.c | 10 ++++++++++
- 3 files changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e742e74..86cb68f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2963,6 +2963,17 @@ else
- fi
- AC_SUBST(USE_RUBYGEMS)
-
-+AC_ARG_ENABLE(versioned-paths,
-+ AS_HELP_STRING([--disable-versioned-paths], [disable paths with version number]),
-+ [enable_versioned_paths="$enableval"], [enable_versioned_paths=yes])
-+if test x"$enable_versioned_paths" = xno; then
-+ AC_DEFINE(DISABLE_VERSIONED_PATHS, 1)
-+ USE_VERSIONED_PATHS=NO
-+else
-+ USE_VERSIONED_PATHS=YES
-+fi
-+AC_SUBST(USE_VERSIONED_PATHS)
-+
- arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
- AS_MKDIR_P("${arch_hdrdir}")
- config_h="${arch_hdrdir}/config.h"
-diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
-index a2221f0..47d8c8f 100755
---- a/tool/mkconfig.rb
-+++ b/tool/mkconfig.rb
-@@ -42,6 +42,7 @@ v_others = []
- vars = {}
- continued_name = nil
- continued_line = nil
-+path_version = "/$(ruby_version)"
- File.foreach "config.status" do |line|
- next if /^#/ =~ line
- name = nil
-@@ -138,6 +139,8 @@ File.foreach "config.status" do |line|
- case name
- when "ruby_version"
- version = val[/\A"(.*)"\z/, 1]
-+ when /^USE_VERSIONED_PATHS$/
-+ path_version = nil if /NO/ =~ val
- end
- end
- # break if /^CEOF/
-@@ -203,15 +206,15 @@ end
- print(*v_fast)
- print(*v_others)
- print <<EOS
-- CONFIG["rubylibdir"] = "$(rubylibprefix)/$(ruby_version)"
-+ CONFIG["rubylibdir"] = "$(rubylibprefix)#{path_version}"
- CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
- EOS
- print <<EOS unless v_disabled["sitedir"]
-- CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
-+ CONFIG["sitelibdir"] = "$(sitedir)#{path_version}"
- CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
- EOS
- print <<EOS unless v_disabled["vendordir"]
-- CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
-+ CONFIG["vendorlibdir"] = "$(vendordir)#{path_version}"
- CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)"
- EOS
- print <<EOS
-diff --git a/version.c b/version.c
-index 59d4e5e..641dc33 100644
---- a/version.c
-+++ b/version.c
-@@ -38,9 +38,15 @@
- #define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby"
- #endif
-
-+#ifdef DISABLE_VERSIONED_PATHS
-+#define RUBY_LIB RUBY_LIB_PREFIX
-+#define RUBY_SITE_LIB2 RUBY_SITE_LIB
-+#define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB
-+#else
- #define RUBY_LIB RUBY_LIB_PREFIX "/"RUBY_LIB_VERSION
- #define RUBY_SITE_LIB2 RUBY_SITE_LIB "/"RUBY_LIB_VERSION
- #define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB "/"RUBY_LIB_VERSION
-+#endif
- #define RUBY_ARCHLIB RUBY_LIB "/"RUBY_ARCH
- #define RUBY_SITE_ARCHLIB RUBY_SITE_LIB2 "/"RUBY_SITEARCH
- #define RUBY_VENDOR_ARCHLIB RUBY_VENDOR_LIB2 "/"RUBY_SITEARCH
-@@ -75,8 +81,10 @@ const char ruby_initial_load_paths[] =
- RUBY_SITE_THIN_ARCHLIB "\0"
- #endif
- RUBY_SITE_ARCHLIB "\0"
-+#ifndef DISABLE_VERSIONED_PATHS
- RUBY_SITE_LIB "\0"
- #endif
-+#endif
-
- #ifndef NO_RUBY_VENDOR_LIB
- RUBY_VENDOR_LIB2 "\0"
-@@ -84,8 +92,10 @@ const char ruby_initial_load_paths[] =
- RUBY_VENDOR_THIN_ARCHLIB "\0"
- #endif
- RUBY_VENDOR_ARCHLIB "\0"
-+#ifndef DISABLE_VERSIONED_PATHS
- RUBY_VENDOR_LIB "\0"
- #endif
-+#endif
-
- RUBY_LIB "\0"
- #ifdef RUBY_THIN_ARCHLIB
---
-1.7.7.3
-diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
-index a3c65bf..0575730 100644
---- a/lib/rdoc/ri/paths.rb
-+++ b/lib/rdoc/ri/paths.rb
-@@ -11,9 +11,9 @@ module RDoc::RI::Paths
- version = RbConfig::CONFIG['ruby_version']
-
- base = if RbConfig::CONFIG.key? 'ridir' then
-- File.join RbConfig::CONFIG['ridir'], version
-+ File.join [RbConfig::CONFIG['ridir'], RbConfig::CONFIG['USE_VERSIONED_PATHS'] == 'YES' ? version : nil].compact
- else
-- File.join RbConfig::CONFIG['datadir'], 'ri', version
-+ File.join [RbConfig::CONFIG['datadir'], 'ri', RbConfig::CONFIG['USE_VERSIONED_PATHS'] == 'YES' ? version : nil].compact
- end
-
- SYSDIR = File.join base, "system"
-diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
-index cec8c9f..fed14d2 100755
---- a/tool/rbinstall.rb
-+++ b/tool/rbinstall.rb
-@@ -379,7 +379,7 @@ end
-
- install?(:doc, :rdoc) do
- if $rdocdir
-- ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
-+ ridatadir = File.join([CONFIG['ridir'], RbConfig::CONFIG['USE_VERSIONED_PATHS'] == 'YES' ? RbConfig::CONFIG['ruby_version'] : nil, "system"].compact)
- prepare "rdoc", ridatadir
- install_recursive($rdocdir, ridatadir, :mode => $data_mode)
- end
---
-1.7.6
-
diff --git a/site-and-vendor-arch-flags.patch b/site-and-vendor-arch-flags.patch
deleted file mode 100644
index 1363063..0000000
--- a/site-and-vendor-arch-flags.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From b0a875862d14244ca41cd1e1e9090f87757aaeb9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
-Date: Mon, 5 Sep 2011 13:10:47 +0200
-Subject: [PATCH] Added configuration flags for site and vendor architecture
- specific directories.
-
----
- Makefile.in | 3 +++
- configure.in | 40 ++++++++++++++++++++++++++++++++++++++++
- tool/mkconfig.rb | 8 ++++++--
- version.c | 4 ++++
- 4 files changed, 53 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index bcdaf5f..f57e4c4 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -34,6 +34,9 @@ datadir = @datadir@
- archdir = @archdir@
- sitearch = @sitearch@
- sitedir = @sitedir@
-+sitearchdir= @sitearchdir@
-+vendordir = @vendordir@
-+vendorarchdir = @vendorarchdir@
- ruby_version = @ruby_version@
-
- TESTUI = console
-diff --git a/configure.in b/configure.in
-index 83e5d76..31532bd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2811,6 +2811,15 @@ until SITE_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITE_DIR}"; do
- dir="${SITE_DIR}"
- done
-
-+AC_ARG_WITH(sitearchdir,
-+ AS_HELP_STRING([--with-sitearchdir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]]]),
-+ [sitearchdir=$withval],
-+ [sitearchdir='${rubylibprefix}/site_ruby/${arch}'])
-+dir="${sitearchdir}"
-+until SITEARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${SITEARCH_DIR}"; do
-+ dir="${SITEARCH_DIR}"
-+done
-+
- AC_ARG_WITH(vendordir,
- AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]]]),
- [vendordir=$withval],
-@@ -2820,19 +2829,32 @@ until VENDOR_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDOR_DIR}"; do
- dir="${VENDOR_DIR}"
- done
-
-+AC_ARG_WITH(vendorarchdir,
-+ AS_HELP_STRING([--with-vendorarchdir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]]]),
-+ [vendorarchdir=$withval],
-+ [vendorarchdir='${rubylibprefix}/vendor_ruby/${arch}'])
-+dir="${vendorarchdir}"
-+until VENDORARCH_DIR=`eval echo \\"${dir}\\"`; test "x${dir}" = "x${VENDORARCH_DIR}"; do
-+ dir="${VENDORARCH_DIR}"
-+done
-+
- if test "${LOAD_RELATIVE+set}"; then
- AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
- RUBY_EXEC_PREFIX=""
- RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
- RUBY_ARCH_LIB_PATH="`eval echo "$ARCH_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
- RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-+ RUBY_SITE_ARCHLIB_PATH="`eval echo "$SITEARCH_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
- RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-+ RUBY_VENDOR_ARCHLIB_PATH="`eval echo "$VENDORARCH_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
- else
- RUBY_EXEC_PREFIX="`eval echo \\"$exec_prefix/\\" | sed 's|^NONE/|'"$prefix"'/|;s|/$||'`"
- RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
- RUBY_ARCH_LIB_PATH="`eval echo \\"$ARCH_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
- RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-+ RUBY_SITE_ARCHLIB_PATH="`eval echo \\"$SITEARCH_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
- RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-+ RUBY_VENDOR_ARCHLIB_PATH="`eval echo \\"$VENDORARCH_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
- fi
-
- pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)'
-@@ -2850,6 +2872,13 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"],
- [
- RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\""
- ])
-+AS_CASE(["$RUBY_SITE_ARCHLIB_PATH"],
-+ ["$RUBY_LIB_PREFIX/"*], [
-+ RUBY_SITE_ARCHLIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_ARCHLIB_PATH\" : \"$pat\"`"'"'
-+ ],
-+ [
-+ RUBY_SITE_ARCHLIB_PATH="\"${RUBY_SITE_ARCHLIB_PATH}\""
-+ ])
- AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
- ["$RUBY_LIB_PREFIX/"*], [
- RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"'
-@@ -2857,6 +2886,13 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"],
- [
- RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\""
- ])
-+AS_CASE(["$RUBY_VENDOR_ARCHLIB_PATH"],
-+ ["$RUBY_LIB_PREFIX/"*], [
-+ RUBY_VENDOR_ARCHLIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_ARCHLIB_PATH\" : \"$pat\"`"'"'
-+ ],
-+ [
-+ RUBY_VENDOR_ARCHLIB_PATH="\"${RUBY_VENDOR_ARCHLIB_PATH}\""
-+ ])
- pat=`echo "$RUBY_EXEC_PREFIX/" | tr -c '\012' .`'\(.*\)'
- AS_CASE(["$RUBY_LIB_PREFIX"],
- ["$RUBY_EXEC_PREFIX/"*], [
-@@ -2878,19 +2914,23 @@ if test "x$SITE_DIR" = xno; then
- AC_DEFINE(NO_RUBY_SITE_LIB)
- else
- AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH})
-+ AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, ${RUBY_SITE_ARCHLIB_PATH})
- fi
- if test "x$VENDOR_DIR" = xno; then
- AC_DEFINE(NO_RUBY_VENDOR_LIB)
- else
- AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH})
-+ AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, ${RUBY_VENDOR_ARCHLIB_PATH})
- fi
-
- AC_SUBST(arch)dnl
- AC_SUBST(sitearch)dnl
- AC_SUBST(ruby_version)dnl
- AC_SUBST(archdir)dnl
- AC_SUBST(sitedir)dnl
-+AC_SUBST(sitearchdir)dnl
- AC_SUBST(vendordir)dnl
-+AC_SUBST(vendorarchdir)dnl
-
- configure_args=$ac_configure_args
- AC_SUBST(configure_args)dnl
-diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
-index b707c4b..6230720 100755
---- a/tool/mkconfig.rb
-+++ b/tool/mkconfig.rb
-@@ -44,6 +44,8 @@ v_others = []
- continued_line = nil
- path_version = "/$(ruby_version)"
- archdir_override = "$(vendorlibdir)/$(sitearch)"
-+sitearchdir_override = "$(sitelibdir)/$(sitearch)"
-+vendorarchdir_override = "$(vendorlibdir)/$(sitearch)"
- File.foreach "config.status" do |line|
- next if /^#/ =~ line
- name = nil
-@@ -79,6 +81,8 @@ File.foreach "config.status" do |line|
- when /^RUBY_SO_NAME$/; next if $so_name
- when /^arch$/; if val.empty? then val = arch else arch = val end
- when /^archdir$/; archdir_override = val; next
-+ when /^sitearchdir$/; sitearchdir_override = val; next
-+ when /^vendorarchdir$/; vendorarchdir_override = val; next
- when /^sitearch/; val = '$(arch)' if val.empty?
- end
- case val
-@@ -213,11 +217,11 @@ print <<EOS
- EOS
- print <<EOS unless v_disabled["sitedir"]
- CONFIG["sitelibdir"] = "$(sitedir)#{path_version}"
-- CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
-+ CONFIG["sitearchdir"] = "#{sitearchdir_override}"
- EOS
- print <<EOS unless v_disabled["vendordir"]
- CONFIG["vendorlibdir"] = "$(vendordir)#{path_version}"
-- CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)"
-+ CONFIG["vendorarchdir"] = "#{vendorarchdir_override}"
- EOS
- print <<EOS
- CONFIG["topdir"] = File.dirname(__FILE__)
-diff --git a/version.c b/version.c
-index 59d4e5e..2558aa0 100644
---- a/version.c
-+++ b/version.c
-@@ -50,8 +50,12 @@
- #ifndef RUBY_ARCHLIB
- #define RUBY_ARCHLIB RUBY_LIB "/"RUBY_ARCH
- #endif
-+#ifndef RUBY_SITE_ARCHLIB
- #define RUBY_SITE_ARCHLIB RUBY_SITE_LIB2 "/"RUBY_SITEARCH
-+#endif
-+#ifndef RUBY_VENDOR_ARCHLIB
- #define RUBY_VENDOR_ARCHLIB RUBY_VENDOR_LIB2 "/"RUBY_SITEARCH
-+#endif
- #ifdef RUBY_THINARCH
- #define RUBY_THIN_ARCHLIB RUBY_LIB "/"RUBY_THINARCH
- #define RUBY_SITE_THIN_ARCHLIB RUBY_SITE_LIB2 "/"RUBY_THINARCH
---
-1.7.6.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/313c55d4be464751381a70cf99cee124d76c7b0d
More information about the pld-cvs-commit
mailing list