fb0254bf7e79ead56f62e80456216b71b10731a7
[openwrt/svn-archive/archive.git] / tools / libtool / patches / 100-libdir-fixes.patch
1 Index: libtool-2.4/libltdl/config/ltmain.m4sh
2 ===================================================================
3 --- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2010-09-22 16:45:18.000000000 +0200
4 +++ libtool-2.4/libltdl/config/ltmain.m4sh 2010-12-06 22:51:21.961732599 +0100
5 @@ -5715,8 +5715,14 @@
6 absdir="$abs_ladir"
7 libdir="$abs_ladir"
8 else
9 - dir="$lt_sysroot$libdir"
10 - absdir="$lt_sysroot$libdir"
11 + # Adding 'libdir' from the .la file to our library search paths
12 + # breaks crosscompilation horribly. We cheat here and don't add
13 + # it, instead adding the path where we found the .la. -CL
14 + dir="$lt_sysroot$abs_ladir"
15 + absdir="$abs_ladir"
16 + libdir="$abs_ladir"
17 + #dir="$libdir"
18 + #absdir="$lt_sysroot$libdir"
19 fi
20 test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
21 else
22 @@ -6114,8 +6120,6 @@
23 add="$libdir/$linklib"
24 fi
25 else
26 - # We cannot seem to hardcode it, guess we'll fake it.
27 - add_dir="-L$libdir"
28 # Try looking first in the location we're being installed to.
29 if test -n "$inst_prefix_dir"; then
30 case $libdir in
31 @@ -6270,7 +6274,17 @@
32 fi
33 ;;
34 *)
35 - path="-L$absdir/$objdir"
36 + # OE sets installed=no in staging. We need to look in $objdir and $absdir,
37 + # preferring $objdir. RP 31/04/2008
38 + if test -f "$absdir/$objdir/$depdepl" ; then
39 + depdepl="$absdir/$objdir/$depdepl"
40 + path="-L$absdir/$objdir"
41 + elif test -f "$absdir/$depdepl" ; then
42 + depdepl="$absdir/$depdepl"
43 + path="-L$absdir"
44 + else
45 + path="-L$absdir/$objdir"
46 + fi
47 ;;
48 esac
49 else