diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-30 18:08:45 +0000 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-30 18:08:45 +0000 |
commit | 51d6591729fd2efa57f444ca0d39e70d9340a433 (patch) | |
tree | d979f3d2c08522dc780b43c7cb797f19caa065bb | |
parent | 508cab829caa0efb966626bba5e6ca83313bf384 (diff) | |
download | upstream-51d6591729fd2efa57f444ca0d39e70d9340a433.tar.gz upstream-51d6591729fd2efa57f444ca0d39e70d9340a433.tar.bz2 upstream-51d6591729fd2efa57f444ca0d39e70d9340a433.zip |
libtool: Don't use the libdir path found in .la files. Fixes the build of various packages.
SVN-Revision: 19422
-rw-r--r-- | package/libtool/patches/100-libdir_path.patch | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch index 08c4c6806a..1132c38169 100644 --- 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 |