From: Gary V. Vaughan Date: Thu, 18 May 2006 00:10:37 +0000 (+0000) Subject: * libltdl/config/ltmain.m4sh, libltdl/m4/libtool.m4 X-Git-Tag: release-2-1b~288 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33f72b2ff547df3bde97cf49a24dfdfceeba014a;p=thirdparty%2Flibtool.git * libltdl/config/ltmain.m4sh, libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG, _LT_LANG_F77_CONFIG, _LT_LANG_FC_CONFIG), tests/link-order.at [ aix4*, aix5*, hpux10*, hpux11* ]: rename hardcode_direct_static to hardcode_direct_absolute. * doc/libtool.texi (libtool script contents): Adjust. --- diff --git a/ChangeLog b/ChangeLog index dfb70c66a..f87cd35f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ -2006-05-11 Gary V. Vaughan +2006-05-17 Gary V. Vaughan + + * libltdl/config/ltmain.m4sh, libltdl/m4/libtool.m4 + (_LT_LINKER_SHLIBS, _LT_LANG_CXX_CONFIG, _LT_LANG_F77_CONFIG, + _LT_LANG_FC_CONFIG), tests/link-order.at + [ aix4*, aix5*, hpux10*, hpux11* ]: rename + hardcode_direct_static to hardcode_direct_absolute. + * doc/libtool.texi (libtool script contents): Adjust. * libltdl/ltdl.c (lt_dlhandle_fetch): Arguments to lt_dlhandle_iterate were in the wrong order. diff --git a/doc/libtool.texi b/doc/libtool.texi index 22ed3ebb1..146a65f5d 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -5355,10 +5355,11 @@ line (such as @samp{@var{dir}/lib@var{name}.a}) when @var{hardcode_libdir_flag_spec} is specified. @end defvar -@defvar hardcode_direct_static -Static library dependencies do not use @var{shlibpath_var}. Default -to @samp{no}. However, if @var{hardcode_direct} is @samp{yes} but -would create such a static library dependency, set to @samp{yes}. +@defvar hardcode_direct_absolute +Some architectures hardcode "absolute" library directories that can not +be overridden by @var{shlibpath_var} when @var{hardcode_direct} is +@samp{yes}. In that case set @var{hardcode_direct_absolute} to +@samp{yes}, or otherwise @samp{no}. @end defvar @defvar hardcode_into_libs diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh index 7a26e8157..df91539ca 100644 --- a/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh @@ -3833,7 +3833,7 @@ func_mode_link () ;; relink) if test "$hardcode_direct" = yes && - test "$hardcode_direct_static" = no; then + test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then add_dir="-L$dir" @@ -3889,7 +3889,7 @@ func_mode_link () add= # Finalize command for both is simple: just hardcode it. if test "$hardcode_direct" = yes && - test "$hardcode_direct_static" = no; then + test "$hardcode_direct_absolute" = no; then add="$libdir/$linklib" elif test "$hardcode_minus_L" = yes; then add_dir="-L$libdir" diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index e474837ce..a3e835726 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -3969,7 +3969,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(hardcode_automatic, $1)=no _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_direct_static, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= @@ -4319,7 +4319,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_static, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' @@ -4565,7 +4565,7 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_static, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -4610,7 +4610,7 @@ _LT_EOF ;; *) _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_direct_static, $1)=yes + _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' # hardcode_minus_L: Not really in the search PATH, @@ -4981,10 +4981,10 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], _LT_TAGDECL([], [hardcode_direct], [0], [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the resulting binary]) -_LT_TAGDECL([], [hardcode_direct_static], [0], +_LT_TAGDECL([], [hardcode_direct_absolute], [0], [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the resulting binary and the resulting library dependency is - static, impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting ${shlibpath_var} if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5145,7 +5145,7 @@ _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(archive_expsym_cmds, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_static, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= @@ -6402,7 +6402,7 @@ _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(archive_expsym_cmds, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_static, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= @@ -6536,7 +6536,7 @@ _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(archive_expsym_cmds, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no -_LT_TAGVAR(hardcode_direct_static, $1)=no +_LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= diff --git a/tests/link-order.at b/tests/link-order.at index 75f96e517..615b23e77 100644 --- a/tests/link-order.at +++ b/tests/link-order.at @@ -20,7 +20,7 @@ AT_SETUP([Link order test.]) AT_KEYWORDS([libtool]) -eval `$LIBTOOL --config | $EGREP '^(hardcode_direct|hardcode_direct_static|shrext_cmds)='` +eval `$LIBTOOL --config | $EGREP '^(hardcode_direct|hardcode_direct_absolute|shrext_cmds)='` LDFLAGS="$LDFLAGS -no-undefined" module=no @@ -72,7 +72,7 @@ case $host_os in aix* | interix*) ;; # These systems have different path syntax *) # Do not error if we do not relink (e.g. static-only systems) - case $hardcode_direct$hardcode_direct_static in + case $hardcode_direct$hardcode_direct_absolute in yesno) AT_CHECK([if $EGREP relinking stderr; then $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout