mirror of
https://git.yoctoproject.org/poky
synced 2026-03-04 06:19:40 +01:00
d42466ea43
This upgrades these recipes:
libtool_2.2.6.bb -> libtool_2.2.10.bb
libtool-native_2.2.6.bb -> libtool-native_2.2.10.bb
libtool-cross_2.2.6.bb -> libtool-cross_2.2.10.bb
libtool-nativesdk_2.2.6.bb -> libtool-nativesdk_2.2.10.bb
Also fixes build failure caused by having aclocal.m4 built with older version
of libtool.
Rebased these patches for the newer version sources
add_dolt.patch
cross_compile.patch
dolt.m4
Changed this patch to fix documentation building for non-x86 archs
prefix.patch
Rebased and changed to fix the building of ncurses recipe:
trailingslash.patch
Also updated metadata variables like LICENSE & LIC_CHKSUM_FILES
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
56 lines
1.8 KiB
Diff
56 lines
1.8 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.2.10/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
|
|
@@ -5519,8 +5525,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
|
|
@@ -5667,7 +5671,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
|