mirror of
https://git.yoctoproject.org/poky
synced 2026-02-24 10:29:40 +01:00
563953df47
Taking out of this code from patch as the newer upstream code has fix, and this patch is not needed. cross-compile.patch: -Index: libtool-2.2.10/libltdl/config/ltmain.m4sh +Index: libtool-2.4/libltdl/config/ltmain.m4sh =================================================================== ---- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh -+++ libtool-2.2.10/libltdl/config/ltmain.m4sh -@@ -5147,8 +5147,14 @@ func_mode_link () - 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 Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
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.4/libltdl/config/ltmain.m4sh
|
|
===================================================================
|
|
--- libtool-2.4.orig/libltdl/config/ltmain.m4sh
|
|
+++ libtool-2.4/libltdl/config/ltmain.m4sh
|
|
@@ -6121,8 +6121,6 @@ func_mode_link ()
|
|
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
|
|
@@ -6277,7 +6275,17 @@ func_mode_link ()
|
|
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
|