From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 16 Mar 2006 20:48:52 +0000 (+0000)
Subject: * ltmain.in (link mode) [ openbsd, netbsd, dragonfly, .. ]:
X-Git-Tag: release-1-5-23b~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fccc90273a325feefa39fe1258dd1905f7f81d5e;p=thirdparty%2Flibtool.git

* 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 <joerg@netbsd.org> and
Marc Espie <espie@nerim.net> and others.
---

diff --git a/ChangeLog b/ChangeLog
index b0a0cf50b..34a4ea2e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2006-03-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* 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 <joerg@netbsd.org> and
+	Marc Espie <espie@nerim.net> and others.
+
 	* libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [ freebsd,
 	dragonfly ]: Fix 1.5.22 regression caused by too strict $host_os
 	match that stopped DragonFly from working.
diff --git a/NEWS b/NEWS
index 91336b825..f81e505c0 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 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:
diff --git a/THANKS b/THANKS
index 0363c56d0..64d84e09f 100644
--- a/THANKS
+++ b/THANKS
@@ -89,6 +89,7 @@
   Jeff Squyres			jsquyres@lam-mpi.org
   Jeremy C. Reed		reed@reedmedia.net
   Joel N. Weber II		devnull@gnu.org
+  Joerg Sonnenberger		joerg@netbsd.org
   Joseph Beckenbach III		jrb3@best.com
   Kenneth Albanowski		kjahds@kjahds.com
   Kevin Ryde			user42@zip.com.au
diff --git a/ltmain.in b/ltmain.in
index e08000303..cff4a70bc 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -3439,11 +3439,11 @@ EOF
       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.