[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Add new variable inherit_rpath to branch-1-5
From: |
Albert Chin |
Subject: |
Add new variable inherit_rpath to branch-1-5 |
Date: |
Wed, 11 Feb 2004 10:49:08 -0600 |
User-agent: |
Mutt/1.4i |
This patch fixes:
http://mail.gnu.org/archive/html/libtool/2003-07/msg00086.html
--
albert chin (address@hidden)
-- snip snip
2004-02-09 Albert Chin-A-Young <address@hidden>
* libtool.m4: Add new variable, inherit_rpath, if the
RPATHs of the libraries being linked are inherited in
the output file. For systems with a linker exhibiting
this feature, programs/libraries must be relinked at
installation time.
Index: libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.27
diff -u -3 -p -r1.314.2.27 libtool.m4
--- libtool.m4 5 Feb 2004 14:50:28 -0000 1.314.2.27
+++ libtool.m4 10 Feb 2004 01:34:02 -0000
@@ -1037,7 +1015,8 @@ else
fi
AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink ||
+ test "$_LT_AC_TAGVAR(inherit_rpath, $1)" = yes; then
# Fast installation is not supported
enable_fast_install=no
elif test "$shlibpath_overrides_runpath" = yes ||
@@ -2627,6 +2587,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(inherit_rpath, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
@@ -3114,6 +3075,7 @@ case $host_os in
esac
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(inherit_rpath, $1)=yes
;;
linux*)
case $cc_basename in
@@ -3656,6 +3618,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(inherit_rpath, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
_LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
@@ -3888,6 +3852,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
_LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
_LT_AC_TAGVAR(hardcode_automatic, $1) \
+ _LT_AC_TAGVAR(inherit_rpath, $1) \
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -4239,6 +4207,10 @@ hardcode_shlibpath_var=$_LT_AC_TAGVAR(ha
# and all subsequent libraries and executables linked against it.
hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$_LT_AC_TAGVAR(inherit_rpath, $1)
+
# Variables whose values should be saved in libtool wrapper scripts and
# restored at relink time.
variables_saved_for_relink="$variables_saved_for_relink"
@@ -5023,6 +4995,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(inherit_rpath, $1)=no
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -5545,6 +5518,7 @@ $echo "local: *; };" >> $output_objdir/$
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(inherit_rpath, $1)=yes
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Add new variable inherit_rpath to branch-1-5,
Albert Chin <=