Blame SOURCES/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch

d54c42
From e24d97c938c481450ed80ec83e5399595946c1ae Mon Sep 17 00:00:00 2001
d54c42
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
d54c42
Date: Fri, 8 Feb 2013 22:48:41 +0100
d54c42
Subject: [PATCH] Prevent duplicated paths when empty version string is
d54c42
 configured.
d54c42
d54c42
---
d54c42
 configure.in     | 15 +++++++++------
d54c42
 loadpath.c       | 12 ++++++++++++
d54c42
 tool/mkconfig.rb |  2 +-
d54c42
 3 files changed, 22 insertions(+), 7 deletions(-)
d54c42
d54c42
diff --git a/configure.in b/configure.in
d54c42
index 17ed3ed..5843651 100644
d54c42
--- a/configure.in
d54c42
+++ b/configure.in
d54c42
@@ -3971,8 +3971,6 @@ AS_CASE(["$target_os"],
d54c42
     rubyw_install_name='$(RUBYW_INSTALL_NAME)'
d54c42
     ])
d54c42
 
d54c42
-rubylibdir='${rubylibprefix}/${ruby_version}'
d54c42
-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
d54c42
 
d54c42
 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
d54c42
 AC_ARG_WITH(rubyarchprefix,
d54c42
@@ -4002,6 +4000,7 @@ AC_ARG_WITH(ruby-version,
d54c42
             [ruby_version=full])
d54c42
 unset RUBY_LIB_VERSION
d54c42
 unset RUBY_LIB_VERSION_STYLE
d54c42
+ruby_version_suffix=/'${ruby_version}'
d54c42
 AS_CASE(["$ruby_version"],
d54c42
   [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
d54c42
   [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
d54c42
@@ -4018,30 +4017,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
d54c42
     ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
d54c42
     eval $ruby_version
d54c42
 elif test -z "${ruby_version}"; then
d54c42
-    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
d54c42
+    unset ruby_version_suffix
d54c42
+    AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
d54c42
 else
d54c42
     RUBY_LIB_VERSION="${ruby_version}"
d54c42
 fi
d54c42
 AC_SUBST(RUBY_LIB_VERSION_STYLE)
d54c42
 AC_SUBST(RUBY_LIB_VERSION)
d54c42
 
d54c42
+rubylibdir='${rubylibprefix}'${ruby_version_suffix}
d54c42
+rubyarchdir=${multiarch+'${rubyarchprefix}'${ruby_version_suffix}}${multiarch-'${rubylibdir}/${arch}'}
d54c42
+
d54c42
 AC_ARG_WITH(sitedir,
d54c42
 	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
d54c42
             [sitedir=$withval],
d54c42
             [sitedir='${rubylibprefix}/site_ruby'])
d54c42
-sitelibdir='${sitedir}/${ruby_version}'
d54c42
+sitelibdir='${sitedir}'${ruby_version_suffix}
d54c42
 
d54c42
 AC_ARG_WITH(sitearchdir,
d54c42
 	    AS_HELP_STRING([--with-sitearchdir=DIR],
d54c42
 			   [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
d54c42
             [sitearchdir=$withval],
d54c42
-            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
d54c42
+            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_suffix}}${multiarch-'${sitelibdir}/${sitearch}'}])
d54c42
 
d54c42
 AC_ARG_WITH(vendordir,
d54c42
 	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
d54c42
             [vendordir=$withval],
d54c42
             [vendordir='${rubylibprefix}/vendor_ruby'])
d54c42
-vendorlibdir='${vendordir}/${ruby_version}'
d54c42
+vendorlibdir='${vendordir}'${ruby_version_suffix}
d54c42
 
d54c42
 AC_ARG_WITH(vendorarchdir,
d54c42
 	    AS_HELP_STRING([--with-vendorarchdir=DIR],
d54c42
diff --git a/loadpath.c b/loadpath.c
d54c42
index 9160031..0d4d953 100644
d54c42
--- a/loadpath.c
d54c42
+++ b/loadpath.c
d54c42
@@ -65,22 +65,34 @@ const char ruby_initial_load_paths[] =
d54c42
     RUBY_SEARCH_PATH "\0"
d54c42
 #endif
d54c42
 #ifndef NO_RUBY_SITE_LIB
d54c42
+#ifdef RUBY_LIB_VERSION_BLANK
d54c42
+    RUBY_SITE_LIB "\0"
d54c42
+#else
d54c42
     RUBY_SITE_LIB2 "\0"
d54c42
+#endif
d54c42
 #ifdef RUBY_THINARCH
d54c42
     RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
d54c42
 #endif
d54c42
     RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
d54c42
+#ifndef RUBY_LIB_VERSION_BLANK
d54c42
     RUBY_SITE_LIB "\0"
d54c42
 #endif
d54c42
+#endif
d54c42
 
d54c42
 #ifndef NO_RUBY_VENDOR_LIB
d54c42
+#ifdef RUBY_LIB_VERSION_BLANK
d54c42
+    RUBY_VENDOR_LIB "\0"
d54c42
+#else
d54c42
     RUBY_VENDOR_LIB2 "\0"
d54c42
+#endif
d54c42
 #ifdef RUBY_THINARCH
d54c42
     RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
d54c42
 #endif
d54c42
     RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
d54c42
+#ifndef RUBY_LIB_VERSION_BLANK
d54c42
     RUBY_VENDOR_LIB "\0"
d54c42
 #endif
d54c42
+#endif
d54c42
 
d54c42
     RUBY_LIB "\0"
d54c42
 #ifdef RUBY_THINARCH
d54c42
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
d54c42
index 07076d4..35e6c3c 100755
d54c42
--- a/tool/mkconfig.rb
d54c42
+++ b/tool/mkconfig.rb
d54c42
@@ -123,7 +123,7 @@ File.foreach "config.status" do |line|
d54c42
     val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
d54c42
     case name
d54c42
     when /^prefix$/
d54c42
-      val = "(TOPDIR || DESTDIR + #{val})"
d54c42
+      val = "(((TOPDIR && TOPDIR.empty?) ? nil : TOPDIR) || DESTDIR + #{val})"
d54c42
     when /^ARCH_FLAG$/
d54c42
       val = "arch_flag || #{val}" if universal
d54c42
     when /^UNIVERSAL_ARCHNAMES$/
d54c42
-- 
d54c42
1.9.0
d54c42