FYI: 314-gary-rename-to-hardcode_direct_absolute.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.

  Index: ChangeLog
  from  Gary V. Vaughan  <address@hidden>
        * 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.
  Index: doc/libtool.texi
  ===================================================================
  RCS file: /sources/libtool/libtool/doc/libtool.texi,v
  retrieving revision 1.214
  diff -u -p -u -r1.214 libtool.texi
  --- doc/libtool.texi 17 May 2006 17:59:47 -0000 1.214
  +++ doc/libtool.texi 18 May 2006 00:09:04 -0000
  @@ -5355,10 +5355,11 @@ line (such as @address@hidden/address@hidden
   @var{hardcode_libdir_flag_spec} is specified.
   @end defvar
   
  address@hidden 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}.
  address@hidden hardcode_direct_absolute
  +Some architectures hardcode "absolute" library directories that can not
  +be overridden by @var{shlibpath_var} when @var{hardcode_direct} is
  address@hidden  In that case set @var{hardcode_direct_absolute} to
  address@hidden, or otherwise @samp{no}.
   @end defvar
   
   @defvar hardcode_into_libs
  Index: libltdl/config/ltmain.m4sh
  ===================================================================
  RCS file: /sources/libtool/libtool/libltdl/config/ltmain.m4sh,v
  retrieving revision 1.45
  diff -u -p -u -r1.45 ltmain.m4sh
  --- libltdl/config/ltmain.m4sh 17 May 2006 14:28:40 -0000 1.45
  +++ libltdl/config/ltmain.m4sh 18 May 2006 00:09:07 -0000
  @@ -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"
  Index: libltdl/m4/libtool.m4
  ===================================================================
  RCS file: /sources/libtool/libtool/libltdl/m4/libtool.m4,v
  retrieving revision 1.69
  diff -u -p -u -r1.69 libtool.m4
  --- libltdl/m4/libtool.m4 17 May 2006 20:11:03 -0000 1.69
  +++ libltdl/m4/libtool.m4 18 May 2006 00:09:11 -0000
  @@ -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_separat
   _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)=
  Index: tests/link-order.at
  ===================================================================
  RCS file: /sources/libtool/libtool/tests/link-order.at,v
  retrieving revision 1.11
  diff -u -p -u -r1.11 link-order.at
  --- tests/link-order.at 17 May 2006 17:50:05 -0000 1.11
  +++ tests/link-order.at 18 May 2006 00:09:11 -0000
  @@ -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
- -- 
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://blog.azazil.net
GNU Hacker           / )=   http://trac.azazil.net/projects/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
__________________________________________________________
This patch notification generated by cvsapply version 0.15
http://savannah.gnu.org/projects/cvs-utils
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)

iD8DBQFEa7x/FRMICSmD1gYRAs0GAJ46Q8+XPCWBE8oyl7M5D+9tqaA6OQCgxcc9
nEbjE3xJz390q/mKms3dglI=
=iPXn
-----END PGP SIGNATURE-----