Re: Fix linking against uninstalled libs again (1/n)

[Ralf Wildenhues]

I have applied the following patches to HEAD and branch-1-5 to get
the latter to a sane state and both to the same code.  Another change
to remove this and add correct semantics hopefully to follow soon..

Apologies again for the huge delay.

Cheers,
Ralf

branch-1-5:
        * ltmain.in (link mode) [ openbsd, netbsd, dragonfly, .. ]:
        Fix 1.5.22 regression by commenting out the code to remove the
        uninstalled paths.  It was never working, and it is not at the
        right place.  A proper removal code is to follow.  This
        regression was visible on OpenBSD, NetBSD, DragonFly, and other
        systems with hardcode_direct=yes.
        * NEWS, THANKS: Updated.
        Reported by Joerg Sonnenberger <address@hidden> and
        Marc Espie <address@hidden> and others.

Index: NEWS
===================================================================
RCS file: /cvsroot/libtool/libtool/NEWS,v
retrieving revision 1.109.2.43
diff -u -r1.109.2.43 NEWS
--- NEWS        16 Mar 2006 16:58:04 -0000      1.109.2.43
+++ NEWS        16 Mar 2006 17:04:18 -0000
@@ -3,6 +3,9 @@
 New in 1.5.23a: 2006-??-??; CVS version 1.5.23a, Libtool team:
 * Initial support for RDOS.
 * Fix regression on DragonFly that disabled library hardcoding.
+* Fix regression on OpenBSD, NetBSD, DragonFly, and other systems
+  with hardcode_direct=yes that wrongly removed paths to uninstalled
+  libraries during link mode.
 * Bug Fixes.
 
 New in 1.5.22: 2005-12-18; CVS version 1.5.21a, Libtool team:
Index: THANKS
===================================================================
RCS file: /cvsroot/libtool/libtool/THANKS,v
retrieving revision 1.34.2.16
diff -u -r1.34.2.16 THANKS
--- THANKS      16 Mar 2006 16:58:04 -0000      1.34.2.16
+++ THANKS      16 Mar 2006 17:04:19 -0000
@@ -89,6 +89,7 @@
   Jeff Squyres                 address@hidden
   Jeremy C. Reed               address@hidden
   Joel N. Weber II             address@hidden
+  Joerg Sonnenberger           address@hidden
   Joseph Beckenbach III                address@hidden
   Kenneth Albanowski           address@hidden
   Kevin Ryde                   address@hidden
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.123
diff -u -r1.334.2.123 ltmain.in
--- ltmain.in   13 Feb 2006 17:02:53 -0000      1.334.2.123
+++ ltmain.in   16 Mar 2006 17:04:19 -0000
@@ -3439,11 +3439,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-       lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-       deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-       dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % 
%g"`
-      done
+      #for path in $notinst_path; do
+      #        lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% 
$path % %g"`
+      #        deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #        dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% 
-L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
        # If the user specified any rpath flags, then add them.


HEAD:
        * libltdl/config/ltmain.m4sh (func_mode_link): Comment out the
        code to remove uninstalled paths, as it is wrong here.  Change
        the wrong shell quoting that kept it from "working" before.
        * THANKS: Updated.

Index: THANKS
===================================================================
RCS file: /cvsroot/libtool/libtool/THANKS,v
retrieving revision 1.53
diff -u -r1.53 THANKS
--- THANKS      16 Mar 2006 16:56:34 -0000      1.53
+++ THANKS      16 Mar 2006 20:46:03 -0000
@@ -89,6 +89,7 @@
   Jeff Squyres                 address@hidden
   Jeremy C. Reed               address@hidden
   Joel N. Weber II             address@hidden
+  Joerg Sonnenberger           address@hidden
   Joseph Beckenbach III                address@hidden
   Kenneth Albanowski           address@hidden
   Kevin Ryde                   address@hidden
Index: libltdl/config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/config/ltmain.m4sh,v
retrieving revision 1.39
diff -u -r1.39 ltmain.m4sh
--- libltdl/config/ltmain.m4sh  24 Feb 2006 19:45:48 -0000      1.39
+++ libltdl/config/ltmain.m4sh  16 Mar 2006 16:52:28 -0000
@@ -4516,11 +4516,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-       lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e 's% $path % %g'`
-       deplibs=`$ECHO "X$deplibs " | $Xsed -e 's% -L$path % %g'`
-       dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e 's% -L$path % 
%g'`
-      done
+      #for path in $notinst_path; do
+      #        lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% 
$path % %g"`
+      #        deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
+      #        dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% 
-L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
        # If the user specified any rpath flags, then add them.