|
 |
360d2b9 |
From 763c6571697b0bd551a8a0c27d538d00f161a9f3 Mon Sep 17 00:00:00 2001
|
|
|
bf92566 |
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
|
|
bf92566 |
Date: Fri, 8 Feb 2013 22:48:41 +0100
|
|
|
bf92566 |
Subject: [PATCH] Prevent duplicated paths when empty version string is
|
|
|
bf92566 |
configured.
|
|
|
bf92566 |
|
|
|
bf92566 |
---
|
|
|
a03b2d2 |
configure.in | 15 +++++++++------
|
|
|
360d2b9 |
loadpath.c | 12 ++++++++++++
|
|
|
360d2b9 |
2 files changed, 21 insertions(+), 6 deletions(-)
|
|
|
bf92566 |
|
|
|
bf92566 |
diff --git a/configure.in b/configure.in
|
|
|
360d2b9 |
index 88d24ee..4a300b9 100644
|
|
|
bf92566 |
--- a/configure.in
|
|
|
bf92566 |
+++ b/configure.in
|
|
|
df08120 |
@@ -3645,8 +3645,6 @@ AS_CASE(["$target_os"],
|
|
|
360d2b9 |
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
|
|
|
360d2b9 |
])
|
|
|
360d2b9 |
|
|
|
a03b2d2 |
-rubylibdir='${rubylibprefix}/${ruby_version}'
|
|
|
a03b2d2 |
-rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
|
|
|
a03b2d2 |
|
|
|
a03b2d2 |
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
|
|
a03b2d2 |
AC_ARG_WITH(rubyarchprefix,
|
|
|
df08120 |
@@ -3676,6 +3676,7 @@ AC_ARG_WITH(ruby-version,
|
|
|
a03b2d2 |
[ruby_version=full])
|
|
|
a03b2d2 |
unset RUBY_LIB_VERSION
|
|
|
a03b2d2 |
unset RUBY_LIB_VERSION_STYLE
|
|
|
a03b2d2 |
+ruby_version_suffix=/'${ruby_version}'
|
|
|
a03b2d2 |
AS_CASE(["$ruby_version"],
|
|
|
a03b2d2 |
[full], [RUBY_LIB_VERSION_STYLE='3 /* full */'],
|
|
|
a03b2d2 |
[minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'])
|
|
|
df08120 |
@@ -3692,30 +3691,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
|
|
|
a03b2d2 |
ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
|
|
|
a03b2d2 |
eval $ruby_version
|
|
|
a03b2d2 |
elif test -z "${ruby_version}"; then
|
|
|
a03b2d2 |
- AC_MSG_ERROR([No ruby version, No place for bundled libraries])
|
|
|
a03b2d2 |
+ unset ruby_version_suffix
|
|
|
a03b2d2 |
+ AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1)
|
|
|
bf92566 |
else
|
|
|
a03b2d2 |
RUBY_LIB_VERSION="\"${ruby_version}\""
|
|
|
bf92566 |
fi
|
|
|
a03b2d2 |
AC_SUBST(RUBY_LIB_VERSION_STYLE)
|
|
|
a03b2d2 |
AC_SUBST(RUBY_LIB_VERSION)
|
|
|
bf92566 |
|
|
|
a03b2d2 |
+rubylibdir='${rubylibprefix}'${ruby_version_suffix}
|
|
|
a03b2d2 |
+rubyarchdir=${multiarch+'${rubyarchprefix}'${ruby_version_suffix}}${multiarch-'${rubylibdir}/${arch}'}
|
|
|
a03b2d2 |
+
|
|
|
a03b2d2 |
AC_ARG_WITH(sitedir,
|
|
|
a03b2d2 |
AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
|
|
|
a03b2d2 |
[sitedir=$withval],
|
|
|
a03b2d2 |
[sitedir='${rubylibprefix}/site_ruby'])
|
|
|
a03b2d2 |
-sitelibdir='${sitedir}/${ruby_version}'
|
|
|
a03b2d2 |
+sitelibdir='${sitedir}'${ruby_version_suffix}
|
|
|
a03b2d2 |
|
|
|
a03b2d2 |
AC_ARG_WITH(sitearchdir,
|
|
|
a03b2d2 |
AS_HELP_STRING([--with-sitearchdir=DIR],
|
|
|
a03b2d2 |
[architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
|
|
|
a03b2d2 |
[sitearchdir=$withval],
|
|
|
a03b2d2 |
- [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
|
|
|
a03b2d2 |
+ [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby'${ruby_version_suffix}}${multiarch-'${sitelibdir}/${sitearch}'}])
|
|
|
a03b2d2 |
|
|
|
a03b2d2 |
AC_ARG_WITH(vendordir,
|
|
|
a03b2d2 |
AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
|
|
|
a03b2d2 |
[vendordir=$withval],
|
|
|
a03b2d2 |
[vendordir='${rubylibprefix}/vendor_ruby'])
|
|
|
a03b2d2 |
-vendorlibdir='${vendordir}/${ruby_version}'
|
|
|
a03b2d2 |
+vendorlibdir='${vendordir}'${ruby_version_suffix}
|
|
|
a03b2d2 |
|
|
|
a03b2d2 |
AC_ARG_WITH(vendorarchdir,
|
|
|
a03b2d2 |
AS_HELP_STRING([--with-vendorarchdir=DIR],
|
|
|
a03b2d2 |
diff --git a/loadpath.c b/loadpath.c
|
|
|
360d2b9 |
index 9160031..0d4d953 100644
|
|
|
a03b2d2 |
--- a/loadpath.c
|
|
|
a03b2d2 |
+++ b/loadpath.c
|
|
|
360d2b9 |
@@ -65,22 +65,34 @@ const char ruby_initial_load_paths[] =
|
|
|
a03b2d2 |
RUBY_SEARCH_PATH "\0"
|
|
|
bf92566 |
#endif
|
|
|
a03b2d2 |
#ifndef NO_RUBY_SITE_LIB
|
|
|
360d2b9 |
+#ifdef RUBY_LIB_VERSION_BLANK
|
|
|
360d2b9 |
+ RUBY_SITE_LIB "\0"
|
|
|
360d2b9 |
+#else
|
|
|
a03b2d2 |
RUBY_SITE_LIB2 "\0"
|
|
|
a03b2d2 |
+#endif
|
|
|
a03b2d2 |
#ifdef RUBY_THINARCH
|
|
|
bf92566 |
RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
|
|
|
bf92566 |
#endif
|
|
|
360d2b9 |
RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
|
|
|
360d2b9 |
+#ifndef RUBY_LIB_VERSION_BLANK
|
|
|
360d2b9 |
RUBY_SITE_LIB "\0"
|
|
|
bf92566 |
#endif
|
|
|
360d2b9 |
+#endif
|
|
|
bf92566 |
|
|
|
bf92566 |
#ifndef NO_RUBY_VENDOR_LIB
|
|
|
360d2b9 |
+#ifdef RUBY_LIB_VERSION_BLANK
|
|
|
360d2b9 |
+ RUBY_VENDOR_LIB "\0"
|
|
|
360d2b9 |
+#else
|
|
|
a03b2d2 |
RUBY_VENDOR_LIB2 "\0"
|
|
|
bf92566 |
+#endif
|
|
|
bf92566 |
#ifdef RUBY_THINARCH
|
|
|
a03b2d2 |
RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0"
|
|
|
a03b2d2 |
#endif
|
|
|
360d2b9 |
RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
|
|
|
360d2b9 |
+#ifndef RUBY_LIB_VERSION_BLANK
|
|
|
360d2b9 |
RUBY_VENDOR_LIB "\0"
|
|
|
360d2b9 |
#endif
|
|
|
360d2b9 |
+#endif
|
|
|
360d2b9 |
|
|
|
360d2b9 |
RUBY_LIB "\0"
|
|
|
360d2b9 |
#ifdef RUBY_THINARCH
|
|
|
bf92566 |
--
|
|
|
360d2b9 |
1.8.4.2
|
|
|
bf92566 |
|