kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

configure.in: libdir_basename for -rpath and -install_name

Browse source 
* configure.in (libdir_basename): also -rpath and -install_name flags
  are affected when libruby directory changes.  [Bug #7874]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-21 00:51:11 +00:00
parent e908adc12a
commit 22b51faf7e
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Feb 21 09:51:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (libdir_basename): also -rpath and -install_name flags
are affected when libruby directory changes. [Bug #7874]
Wed Feb 20 19:27:02 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Feb 20 19:27:02 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (HAVE_RB_SCAN_ARGS_OPTIONAL_HASH): for * include/ruby/ruby.h (HAVE_RB_SCAN_ARGS_OPTIONAL_HASH): for

1
Makefile.in
View file

@ -34,6 +34,7 @@ exec_prefix = @exec_prefix@
bindir = @bindir@ bindir = @bindir@
sbindir = @sbindir@ sbindir = @sbindir@
libdir = @libdir@ libdir = @libdir@
libdir_basename = @libdir_basename@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
datarootdir = @datarootdir@ datarootdir = @datarootdir@
datadir = @datadir@ datadir = @datadir@

8
configure.in
View file

@ -2699,6 +2699,7 @@ AS_CASE("$enable_shared", [yes], [
AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`]) AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`])
fi fi
AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"]) AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"])
AC_SUBST(libdir_basename)
AS_CASE(["$target_os"], AS_CASE(["$target_os"],
[freebsd*|dragonfly*], [], [freebsd*|dragonfly*], [],
@ -2719,7 +2720,7 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR" LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
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}/../${libdir_basename}'" LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../\${libdir_basename}'"
LIBRUBY_RELATIVE=yes LIBRUBY_RELATIVE=yes
fi fi
], ],
@ -2776,7 +2777,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/../${libdir_basename}" 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)'
@ -3236,6 +3237,9 @@ archlibdir='${libdir}/${arch}'
sitearchlibdir='${libdir}/${sitearch}' sitearchlibdir='${libdir}/${sitearch}'
archincludedir='${includedir}/${arch}' archincludedir='${includedir}/${arch}'
sitearchincludedir='${includedir}/${sitearch}' sitearchincludedir='${includedir}/${sitearch}'
if test ${libdir_basename+set}; then
libdir_basename="${libdir_basename}"${multiarch+'/${arch}'}
fi
shvar_to_cpp() { shvar_to_cpp() {
local var="$1" val="$2" local var="$1" val="$2"