From e24d97c938c481450ed80ec83e5399595946c1ae Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>

Date: Fri, 8 Feb 2013 22:48:41 +0100

Subject: [PATCH] Prevent duplicated paths when empty version string is

 configured.

---

 configure.in     | 15 +++++++++------

 loadpath.c       | 12 ++++++++++++

 tool/mkconfig.rb |  2 +-

 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/configure.in b/configure.in

index 17ed3ed..5843651 100644

--- a/configure.in

+++ b/configure.in

@@ -3645,8 +3645,6 @@ AS_CASE(["$target_os"],

     rubyw_install_name='$(RUBYW_INSTALL_NAME)'

     ])

-rubylibdir='${rubylibprefix}/${ruby_version}'

-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}

 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}

 AC_ARG_WITH(rubyarchprefix,

@@ -3676,6 +3674,7 @@ AC_ARG_WITH(ruby-version,

             [ruby_version=full])

 unset RUBY_LIB_VERSION

 unset RUBY_LIB_VERSION_STYLE

+ruby_version_suffix=/'${ruby_version}'

 AS_CASE(["$ruby_version"],

   [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],

   [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])

@@ -3692,30 +3691,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then

     ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"

     eval $ruby_version

 elif test -z "${ruby_version}"; then

-    AC_MSG_ERROR([No ruby version, No place for bundled libraries])

+    unset ruby_version_suffix

+    AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)

 else

     RUBY_LIB_VERSION="\"${ruby_version}\""

 fi

 AC_SUBST(RUBY_LIB_VERSION_STYLE)

 AC_SUBST(RUBY_LIB_VERSION)

+rubylibdir='${rubylibprefix}'${ruby_version_suffix}

+rubyarchdir=${multiarch+'${rubyarchprefix}'${ruby_version_suffix}}${multiarch-'${rubylibdir}/${arch}'}

+

 AC_ARG_WITH(sitedir,

 	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),

             [sitedir=$withval],

             [sitedir='${rubylibprefix}/site_ruby'])

-sitelibdir='${sitedir}/${ruby_version}'

+sitelibdir='${sitedir}'${ruby_version_suffix}

 AC_ARG_WITH(sitearchdir,

 	    AS_HELP_STRING([--with-sitearchdir=DIR],

 			   [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),

             [sitearchdir=$withval],

-            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])

+            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_suffix}}${multiarch-'${sitelibdir}/${sitearch}'}])

 AC_ARG_WITH(vendordir,

 	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),

             [vendordir=$withval],

             [vendordir='${rubylibprefix}/vendor_ruby'])

-vendorlibdir='${vendordir}/${ruby_version}'

+vendorlibdir='${vendordir}'${ruby_version_suffix}

 AC_ARG_WITH(vendorarchdir,

 	    AS_HELP_STRING([--with-vendorarchdir=DIR],

diff --git a/loadpath.c b/loadpath.c

index 9160031..0d4d953 100644

--- a/loadpath.c

+++ b/loadpath.c

@@ -65,22 +65,34 @@ const char ruby_initial_load_paths[] =

     RUBY_SEARCH_PATH "\0"

 #endif

 #ifndef NO_RUBY_SITE_LIB

+#ifdef RUBY_LIB_VERSION_BLANK

+    RUBY_SITE_LIB "\0"

+#else

     RUBY_SITE_LIB2 "\0"

+#endif

 #ifdef RUBY_THINARCH

     RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0"

 #endif

     RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"

+#ifndef RUBY_LIB_VERSION_BLANK

     RUBY_SITE_LIB "\0"

 #endif

+#endif

 #ifndef NO_RUBY_VENDOR_LIB

+#ifdef RUBY_LIB_VERSION_BLANK

+    RUBY_VENDOR_LIB "\0"

+#else

     RUBY_VENDOR_LIB2 "\0"

+#endif

 #ifdef RUBY_THINARCH

     RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0"

 #endif

     RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"

+#ifndef RUBY_LIB_VERSION_BLANK

     RUBY_VENDOR_LIB "\0"

 #endif

+#endif

     RUBY_LIB "\0"

 #ifdef RUBY_THINARCH

diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb

index 07076d4..35e6c3c 100755

--- a/tool/mkconfig.rb

+++ b/tool/mkconfig.rb

@@ -121,7 +121,7 @@ File.foreach "config.status" do |line|

     val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump

     case name

     when /^prefix$/

-      val = "(TOPDIR || DESTDIR + #{val})"

+      val = "(((TOPDIR && TOPDIR.empty?) ? nil : TOPDIR) || DESTDIR + #{val})"

     when /^ARCH_FLAG$/

       val = "arch_flag || #{val}" if universal

     when /^UNIVERSAL_ARCHNAMES$/

-- 

1.9.0