Hi Gary,
* Gary V. Vaughan wrote on Thu, Feb 02, 2006 at 11:45:48AM CET:
> Ralf Wildenhues wrote:
> > This fixes the failure uncovered by the new tests posted previously.
> >
> > OK to apply?
>
> Looks good to me! Please go right ahead :-)
Thanks! Since this really is a 1.5.22 regression, I applied it to
branch-1-5, too. Respective patch shown below.
Cheers,
Ralf
* ltmain.in (link mode): Fix logic for adding run paths to
also add paths for installed libtool libraries in case
`-static' is used.
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.118
diff -u -r1.334.2.118 ltmain.in
--- ltmain.in 21 Jan 2006 16:46:08 -0000 1.334.2.118
+++ ltmain.in 3 Feb 2006 09:25:20 -0000
@@ -2497,7 +2497,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; };
then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
