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: expand libdir_basename

Browse source 
* configure.in (libdir_basename): expand with multiarch in configure,
  not to defer the expansion till ruby.pc.in and mkmf.rb.  [Bug #7874]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-02-21 03:42:25 +00:00
parent cb71fee8d9
commit 739c8ffcee
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Thu Feb 21 09:51:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Feb 21 12:42:19 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (libdir_basename): expand with multiarch in configure,
not to defer the expansion till ruby.pc.in and mkmf.rb. [Bug #7874]
* configure.in (libdir_basename): also -rpath and -install_name flags * configure.in (libdir_basename): also -rpath and -install_name flags
are affected when libruby directory changes. [Bug #7874] are affected when libruby directory changes. [Bug #7874]

1
Makefile.in
View file

@ -34,7 +34,6 @@ 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@

32
configure.in
View file

@ -2667,6 +2667,15 @@ AS_CASE(["$target_os"],
DLDLIBS="$DLDLIBS -lc" DLDLIBS="$DLDLIBS -lc"
]) ])
AC_ARG_ENABLE(multiarch,
AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
[multiarch=], [unset multiarch])
archlibdir='${libdir}/${arch}'
sitearchlibdir='${libdir}/${sitearch}'
archincludedir='${includedir}/${arch}'
sitearchincludedir='${includedir}/${sitearch}'
AC_ARG_WITH(soname, AC_ARG_WITH(soname,
AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]), AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
[RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)']) [RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
@ -2680,7 +2689,7 @@ ENABLE_SHARED=no
AC_ARG_ENABLE(shared, AC_ARG_ENABLE(shared,
AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]), AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
[enable_shared=$enableval]) [enable_shared=$enableval])
libprefix='$(libdir)' libprefix=${multiarch+'$(archlibdir)'}${multiarch-'$(libdir)'}
LIBRUBY_RELATIVE=${load_relative-no} LIBRUBY_RELATIVE=${load_relative-no}
AS_CASE("$enable_shared", [yes], [ AS_CASE("$enable_shared", [yes], [
LIBRUBY='$(LIBRUBY_SO)' LIBRUBY='$(LIBRUBY_SO)'
@ -2699,7 +2708,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) libdir_basename="${libdir_basename}"${multiarch+'/${arch}'}
AS_CASE(["$target_os"], AS_CASE(["$target_os"],
[freebsd*|dragonfly*], [], [freebsd*|dragonfly*], [],
@ -2720,7 +2729,8 @@ 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}'" libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
LIBRUBY_RELATIVE=yes LIBRUBY_RELATIVE=yes
fi fi
], ],
@ -2777,7 +2787,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)'
@ -2834,7 +2844,7 @@ AS_CASE("$enable_shared", [yes], [
]) ])
if test "$enable_rpath" = yes; then if test "$enable_rpath" = yes; then
test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS " test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)" LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L${libprefix}"
LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC" LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
fi fi
@ -3229,18 +3239,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)' rubyw_install_name='$(RUBYW_INSTALL_NAME)'
]) ])
AC_ARG_ENABLE(multiarch,
AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
[multiarch=], [unset multiarch])
archlibdir='${libdir}/${arch}'
sitearchlibdir='${libdir}/${sitearch}'
archincludedir='${includedir}/${arch}'
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"
local exec_prefix_pat="`echo \"${exec_prefix}\" | sed 's/\\./\\\\./g'`" local exec_prefix_pat="`echo \"${exec_prefix}\" | sed 's/\\./\\\\./g'`"