diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-03 11:41:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-03 11:41:30 +0000 |
| commit | 972f72f4e47196817b8a3fc62a9e9dd188490f81 (patch) | |
| tree | 77d115be3d0a03cf9b86de1a70d30330e4d236dc /packages/libtool/libtool-2.2.4/cross_compile.patch | |
| parent | b4db5d7f3e1a0470f2111508e2b701acee95055e (diff) | |
| parent | 915c1e3654c4be1667a9390c3671d1a3601e2a56 (diff) | |
merge of '6c9b3832ef2260eb1b3a74e74b1d73166ab79d89'
and 'f275c97e2c93f0e846205b213e997b28ed0b148e'
Diffstat (limited to 'packages/libtool/libtool-2.2.4/cross_compile.patch')
| -rw-r--r-- | packages/libtool/libtool-2.2.4/cross_compile.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/packages/libtool/libtool-2.2.4/cross_compile.patch b/packages/libtool/libtool-2.2.4/cross_compile.patch new file mode 100644 index 0000000000..b4bacbd12f --- /dev/null +++ b/packages/libtool/libtool-2.2.4/cross_compile.patch @@ -0,0 +1,55 @@ +Tweaks to make cross-compiling work combined and updated from various +older patches, some by Chris Larson. +Not upstreable in this form. + +RP - 01/05/2008 + +Index: libtool-2.2.2/libltdl/config/ltmain.m4sh +=================================================================== +--- libtool-2.2.2.orig/libltdl/config/ltmain.m4sh 2008-05-01 21:48:42.000000000 +0100 ++++ libtool-2.2.2/libltdl/config/ltmain.m4sh 2008-05-01 21:51:41.000000000 +0100 +@@ -4454,8 +4454,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 + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else +@@ -4825,8 +4831,6 @@ + add="$libdir/$linklib" + fi + else +- # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in +@@ -4972,7 +4976,17 @@ + fi + ;; + *) +- path="-L$absdir/$objdir" ++ # OE sets installed=no in staging. We need to look in $objdir and $absdir, ++ # preferring $objdir. RP 31/04/2008 ++ if test -f "$absdir/$objdir/$depdepl" ; then ++ depdepl="$absdir/$objdir/$depdepl" ++ path="-L$absdir/$objdir" ++ elif test -f "$absdir/$depdepl" ; then ++ depdepl="$absdir/$depdepl" ++ path="-L$absdir" ++ else ++ path="-L$absdir/$objdir" ++ fi + ;; + esac + else |