From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Fri, 19 Mar 1999 19:50:38 +0000 (+0000)
Subject: * ltconfig.in (sunos4*, with_gnu_ld, hardcode_minus_L): remove,	we
X-Git-Tag: release-1-3~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9689f82c21fb7da73af47e8fa2200ee121f13700;p=thirdparty%2Flibtool.git

* ltconfig.in (sunos4*, with_gnu_ld, hardcode_minus_L): remove,	we
have -rpath
(aix4*, without_gnu_ld, hardcode_shlibpath_var): unsupported is
default
(hpux9*, hpux10*, hpux11*, archive_cmds): drop +s, unneeded here
(hpux9*, hpux10*, hpux11*, hardcode_libdir_flag_spec): add +s
before +b
(hpux9*, hpux10*, hpux11*, shlibpath_overrides_runpath): since +s
appears before +b, set it to yes
(hardcode_shlibpath_var, hardcode_action): do not use
shlibpath_var to specify the compile-time search path; it loses,
and we may end up linking with pre-installed older versions of
libraries instead of yet-to-be-installed ones
(*, hardcode_direct, hardcode_minus_L): remove entries that set
them to no, that is default
---

diff --git a/ChangeLog b/ChangeLog
index eec333710..769ae97ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 1999-03-19  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* ltconfig.in (sunos4*, with_gnu_ld, hardcode_minus_L): remove,	we
+	have -rpath
+	(aix4*, without_gnu_ld, hardcode_shlibpath_var): unsupported is
+	default
+	(hpux9*, hpux10*, hpux11*, archive_cmds): drop +s, unneeded here
+	(hpux9*, hpux10*, hpux11*, hardcode_libdir_flag_spec): add +s
+	before +b
+	(hpux9*, hpux10*, hpux11*, shlibpath_overrides_runpath): since +s
+	appears before +b, set it to yes
+	(hardcode_shlibpath_var, hardcode_action): do not use
+	shlibpath_var to specify the compile-time search path; it loses,
+	and we may end up linking with pre-installed older versions of
+	libraries instead of yet-to-be-installed ones
+	(*, hardcode_direct, hardcode_minus_L): remove entries that set
+	them to no, that is default
+
 	* demo/Makefile.am (hc-direct, hc-libpath, hc-minusL): link with
 	$$hardcode_libdir_flag_spec, if available, with libdir=$(libdir),
 	to make sure the hardcode_* variables will produce the expected
diff --git a/ltconfig.in b/ltconfig.in
index 6766d1b9d..b375ada5a 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1064,7 +1064,6 @@ EOF
     archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
     wlarc=
     hardcode_direct=yes
-    hardcode_minus_L=yes
     hardcode_shlibpath_var=no
     ;;
 
@@ -1162,7 +1161,6 @@ else
     # Though LIBPATH variable hardcodes shlibpath into executable,
     # it doesn't affect searching for -l* libraries; this confuses
     # tests in mdemo.
-    hardcode_shlibpath_var=unsupported
     hardcode_libdir_flag_spec='-L$libdir'
    ;;
 
@@ -1203,7 +1201,6 @@ else
     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
-    hardcode_minus_L=no # verified on 2.2.6
     hardcode_shlibpath_var=no
     ;;
 
@@ -1220,25 +1217,22 @@ else
     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
-    hardcode_minus_L=no
     hardcode_shlibpath_var=no
     ;;
 
   hpux9*)
-    archive_cmds='$rm $objdir/$soname~$LD -b +s +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib'
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib'
+    hardcode_libdir_flag_spec='${wl}+s ${wl}+b ${wl}$libdir'
     hardcode_libdir_separator=:
     hardcode_direct=yes
-    hardcode_minus_L=no
     export_dynamic_flag_spec='${wl}-E'
     ;;
 
   hpux10* | hpux11*)
-    archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts'
+    hardcode_libdir_flag_spec='${wl}+s ${wl}+b ${wl}$libdir'
     hardcode_libdir_separator=:
     hardcode_direct=yes
-    hardcode_minus_L=no
     export_dynamic_flag_spec='${wl}-E'
     ;;
 
@@ -1322,8 +1316,6 @@ else
 
   sysv4.3*)
     archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
-    hardcode_direct=no
-    hardcode_minus_L=no
     hardcode_shlibpath_var=no
     export_dynamic_flag_spec='-Bexport'
     ;;
@@ -1331,16 +1323,12 @@ else
   uts4*)
     archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
     hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=no
-    hardcode_minus_L=no
     hardcode_shlibpath_var=no
     ;;
 
   dgux*)
     archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
     hardcode_libdir_flag_spec='-L$libdir'
-    hardcode_direct=no
-    hardcode_minus_L=no
     hardcode_shlibpath_var=no
     ;;
 
@@ -1544,10 +1532,12 @@ if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var"; then
 
   # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no && \
-     test "$hardcode_minus_L" != no && \
-     test "$hardcode_shlibpath_var" != no; then
-
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$hardcode_shlibpath_var" != no &&
+     test "$hardcode_minus_L" != no; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
   else
@@ -1708,6 +1698,7 @@ hpux9* | hpux10* | hpux11*)
   need_lib_prefix=no
   need_version=no
   shlibpath_var=SHLIB_PATH
+  shlibpath_overrides_runpath=yes # +s before +b in hardcode_libdir_flag_spec
   library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
   soname_spec='${libname}${release}.sl$major'
   # HP-UX runs *really* slowly unless shared libraries are mode 555.