libtool: Don't use the libdir path found in .la files. Fixes the build of various...

SVN-Revision: 19422

diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch
index 08c4c6806a30c0b2bded46dc6a1907faf327fdb6..1132c38169540efd59f8c61198b1ffb945f6431c 100644 (file)
--- a/package/libtool/patches/100-libdir_path.patch
+++ b/package/libtool/patches/100-libdir_path.patch
@@ -10,6 +10,15 @@
        (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
 --- a/ltmain.in
 +++ b/ltmain.in
+@@ -2827,7 +2827,7 @@ EOF
+             fi
+           else
+             # We cannot seem to hardcode it, guess we'll fake it.
+-            add_dir="-L$libdir"
++            add_dir="-L@GLOBAL_LIBDIR@"
+             # Try looking first in the location we're being installed to.
+             if test -n "$inst_prefix_dir"; then
+               case $libdir in
 @@ -5669,7 +5669,7 @@ fi\
                  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                  exit $EXIT_FAILURE