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

d64dc0
From e24d97c938c481450ed80ec83e5399595946c1ae Mon Sep 17 00:00:00 2001
d64dc0
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
d64dc0
Date: Fri, 8 Feb 2013 22:48:41 +0100
d64dc0
Subject: [PATCH] Prevent duplicated paths when empty version string is
d64dc0
 configured.
d64dc0
d64dc0
---
d64dc0
 configure.in     |  3 ++-
d64dc0
 loadpath.c       | 12 ++++++++++++
d64dc0
 tool/mkconfig.rb |  2 +-
d64dc0
 3 files changed, 15 insertions(+), 2 deletions(-)
d64dc0
d64dc0
diff --git a/configure.in b/configure.in
d64dc0
index db37cd6..ce8d149 100644
d64dc0
--- a/configure.in
d64dc0
+++ b/configure.in
d64dc0
@@ -4390,7 +4390,8 @@ AS_CASE(["$ruby_version_dir_name"],
d64dc0
 ruby_version_dir=/'${ruby_version_dir_name}'
d64dc0
 
d64dc0
 if test -z "${ruby_version_dir_name}"; then
d64dc0
-    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
d64dc0
+    unset ruby_version_dir
d64dc0
+    AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
d64dc0
 fi
d64dc0
 
d64dc0
 rubylibdir='${rubylibprefix}'${ruby_version_dir}
d64dc0
diff --git a/loadpath.c b/loadpath.c
d64dc0
index 9160031..0d4d953 100644
d64dc0
--- a/loadpath.c
d64dc0
+++ b/loadpath.c
d64dc0
@@ -65,22 +65,34 @@ const char ruby_initial_load_paths[] =
d64dc0
     RUBY_SEARCH_PATH "\0"
d64dc0
 #endif
d64dc0
 #ifndef NO_RUBY_SITE_LIB
d64dc0
+#ifdef RUBY_LIB_VERSION_BLANK
d64dc0
+    RUBY_SITE_LIB "\0"
d64dc0
+#else
d64dc0
     RUBY_SITE_LIB2 "\0"
d64dc0
+#endif
d64dc0
 #ifdef RUBY_THINARCH
d64dc0
     RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
d64dc0
 #endif
d64dc0
     RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
d64dc0
+#ifndef RUBY_LIB_VERSION_BLANK
d64dc0
     RUBY_SITE_LIB "\0"
d64dc0
 #endif
d64dc0
+#endif
d64dc0
 
d64dc0
 #ifndef NO_RUBY_VENDOR_LIB
d64dc0
+#ifdef RUBY_LIB_VERSION_BLANK
d64dc0
+    RUBY_VENDOR_LIB "\0"
d64dc0
+#else
d64dc0
     RUBY_VENDOR_LIB2 "\0"
d64dc0
+#endif
d64dc0
 #ifdef RUBY_THINARCH
d64dc0
     RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
d64dc0
 #endif
d64dc0
     RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
d64dc0
+#ifndef RUBY_LIB_VERSION_BLANK
d64dc0
     RUBY_VENDOR_LIB "\0"
d64dc0
 #endif
d64dc0
+#endif
d64dc0
 
d64dc0
     RUBY_LIB "\0"
d64dc0
 #ifdef RUBY_THINARCH
d64dc0
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
d64dc0
index 07076d4..35e6c3c 100755
d64dc0
--- a/tool/mkconfig.rb
d64dc0
+++ b/tool/mkconfig.rb
d64dc0
@@ -113,7 +113,7 @@
d64dc0
     val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
d64dc0
     case name
d64dc0
     when /^prefix$/
d64dc0
-      val = "(TOPDIR || DESTDIR + #{val})"
d64dc0
+      val = "(((TOPDIR && TOPDIR.empty?) ? nil : TOPDIR) || DESTDIR + #{val})"
d64dc0
     when /^ARCH_FLAG$/
d64dc0
       val = "arch_flag || #{val}" if universal
d64dc0
     when /^UNIVERSAL_ARCHNAMES$/
d64dc0
-- 
d64dc0
1.9.0
d64dc0