diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-12-27 02:11:03 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-12-27 02:11:03 +0000 |
commit | c00e7702456a5ae784d942c08c822e47c1988533 (patch) | |
tree | d214c39a19b49b58acc1d287b95c4069b168c295 /package/libtool/patches/120-libdir_search.patch | |
parent | 8c1d3fd1912fc16bac084d79d9432b676130f56a (diff) | |
download | master-187ad058-c00e7702456a5ae784d942c08c822e47c1988533.tar.gz master-187ad058-c00e7702456a5ae784d942c08c822e47c1988533.tar.bz2 master-187ad058-c00e7702456a5ae784d942c08c822e47c1988533.zip |
upgrade libtool, add fixes for libdir searching, fix up paths to .la files
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9941 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libtool/patches/120-libdir_search.patch')
-rw-r--r-- | package/libtool/patches/120-libdir_search.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/package/libtool/patches/120-libdir_search.patch b/package/libtool/patches/120-libdir_search.patch new file mode 100644 index 0000000000..ba2ab835ea --- /dev/null +++ b/package/libtool/patches/120-libdir_search.patch @@ -0,0 +1,19 @@ +--- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600 ++++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500 +@@ -2147,8 +2147,14 @@ + absdir="$abs_ladir" + libdir="$abs_ladir" + else +- dir="$libdir" +- absdir="$libdir" ++ # Adding 'libdir' from the .la file to our library search paths ++ # breaks crosscompilation horribly. We cheat here and don't add ++ # it, instead adding the path where we found the .la. -CL ++ dir="$abs_ladir" ++ absdir="$abs_ladir" ++ libdir="$abs_ladir" ++ #dir="$libdir" ++ #absdir="$libdir" + fi + else + dir="$ladir/$objdir" |