1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in: use configured libdir value

Browse Source 
* configure.in (LIBDIR_BASENAME): use configured libdir value to fix
  --enable-load-relative on systems where libdir is not default value,
  overridden in config.site files.  [ruby-core:47267] [Bug #6903]
* ruby.c (ruby_init_loadpath_safe): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-08-29 06:03:09 +00:00
parent 06d98b4d4d
commit 22c81db9d8
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Aug 29 15:03:04 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBDIR_BASENAME): use configured libdir value to fix
--enable-load-relative on systems where libdir is not default value,
overridden in config.site files. [ruby-core:47267] [Bug #6903]
* ruby.c (ruby_init_loadpath_safe): ditto.
Wed Aug 29 14:34:41 2012 NARUSE, Yui <naruse@ruby-lang.org> Wed Aug 29 14:34:41 2012 NARUSE, Yui <naruse@ruby-lang.org>
* addr2line.c: SIZE_MAX is defined in stdint.h, so r36755 breaks * addr2line.c: SIZE_MAX is defined in stdint.h, so r36755 breaks

11
configure.in
View File

@ -2569,6 +2569,13 @@ AS_CASE("$enable_shared", [yes], [
SOLIBS='$(LIBS)' SOLIBS='$(LIBS)'
fi fi
# libdir can be overridden in config.site file (on OpenSUSE at least).
libdir_basename=lib
if test "$bindir" = '${exec_prefix}/bin'; then
AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`])
fi
AC_DEFINE(LIBDIR_BASENAME, ["${libdir_basename}"])
AS_CASE(["$target_os"], AS_CASE(["$target_os"],
[freebsd*|dragonfly*], [], [freebsd*|dragonfly*], [],
[ [
@ -2588,7 +2595,7 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
if test "$load_relative" = yes; then if test "$load_relative" = yes; then
LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../lib'" LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../${libdir_basename}'"
LIBRUBY_RELATIVE=yes LIBRUBY_RELATIVE=yes
fi fi
], ],
@ -2645,7 +2652,7 @@ AS_CASE("$enable_shared", [yes], [
RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)' RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
LIBRUBY_LDSHARED='$(CC) -dynamiclib' LIBRUBY_LDSHARED='$(CC) -dynamiclib'
if test "$load_relative" = yes; then if test "$load_relative" = yes; then
libprefix='@executable_path/../lib' libprefix="@executable_path/../${libdir_basename}"
LIBRUBY_RELATIVE=yes LIBRUBY_RELATIVE=yes
fi fi
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)' LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'

4
ruby.c
View File

@ -412,7 +412,11 @@ ruby_init_loadpath_safe(int safe_level)
p = strrchr(libpath, '/'); p = strrchr(libpath, '/');
if (p) { if (p) {
static const char bindir[] = "/bin"; static const char bindir[] = "/bin";
#ifdef LIBDIR_BASENAME
static const char libdir[] = "/"LIBDIR_BASENAME;
#else
static const char libdir[] = "/lib"; static const char libdir[] = "/lib";
#endif
const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1; const ptrdiff_t bindir_len = (ptrdiff_t)sizeof(bindir) - 1;
const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) - 1; const ptrdiff_t libdir_len = (ptrdiff_t)sizeof(libdir) - 1;
*p = 0; *p = 0;