diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/cross_compile.patch')
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool/cross_compile.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/cross_compile.patch b/meta/recipes-devtools/libtool/libtool/cross_compile.patch new file mode 100644 index 0000000000..fc1f4b6fb2 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/cross_compile.patch | |||
| @@ -0,0 +1,55 @@ | |||
| 1 | Tweaks to make cross-compiling work combined and updated from various | ||
| 2 | older patches, some by Chris Larson. | ||
| 3 | Not upstreable in this form. | ||
| 4 | |||
| 5 | RP - 01/05/2008 | ||
| 6 | |||
| 7 | Index: libtool-2.2.10/libltdl/config/ltmain.m4sh | ||
| 8 | =================================================================== | ||
| 9 | --- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh | ||
| 10 | +++ libtool-2.2.10/libltdl/config/ltmain.m4sh | ||
| 11 | @@ -5147,8 +5147,14 @@ func_mode_link () | ||
| 12 | absdir="$abs_ladir" | ||
| 13 | libdir="$abs_ladir" | ||
| 14 | else | ||
| 15 | - dir="$libdir" | ||
| 16 | - absdir="$libdir" | ||
| 17 | + # Adding 'libdir' from the .la file to our library search paths | ||
| 18 | + # breaks crosscompilation horribly. We cheat here and don't add | ||
| 19 | + # it, instead adding the path where we found the .la. -CL | ||
| 20 | + dir="$abs_ladir" | ||
| 21 | + absdir="$abs_ladir" | ||
| 22 | + libdir="$abs_ladir" | ||
| 23 | + #dir="$libdir" | ||
| 24 | + #absdir="$libdir" | ||
| 25 | fi | ||
| 26 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes | ||
| 27 | else | ||
| 28 | @@ -5519,8 +5525,6 @@ func_mode_link () | ||
| 29 | add="$libdir/$linklib" | ||
| 30 | fi | ||
| 31 | else | ||
| 32 | - # We cannot seem to hardcode it, guess we'll fake it. | ||
| 33 | - add_dir="-L$libdir" | ||
| 34 | # Try looking first in the location we're being installed to. | ||
| 35 | if test -n "$inst_prefix_dir"; then | ||
| 36 | case $libdir in | ||
| 37 | @@ -5667,7 +5671,17 @@ func_mode_link () | ||
| 38 | fi | ||
| 39 | ;; | ||
| 40 | *) | ||
| 41 | - path="-L$absdir/$objdir" | ||
| 42 | + # OE sets installed=no in staging. We need to look in $objdir and $absdir, | ||
| 43 | + # preferring $objdir. RP 31/04/2008 | ||
| 44 | + if test -f "$absdir/$objdir/$depdepl" ; then | ||
| 45 | + depdepl="$absdir/$objdir/$depdepl" | ||
| 46 | + path="-L$absdir/$objdir" | ||
| 47 | + elif test -f "$absdir/$depdepl" ; then | ||
| 48 | + depdepl="$absdir/$depdepl" | ||
| 49 | + path="-L$absdir" | ||
| 50 | + else | ||
| 51 | + path="-L$absdir/$objdir" | ||
| 52 | + fi | ||
| 53 | ;; | ||
| 54 | esac | ||
| 55 | else | ||