mirror of
https://git.yoctoproject.org/poky
synced 2026-02-09 02:03:04 +01:00
b2f192faab
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
|
|
#
|
|
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
|
#
|
|
|
|
--- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600
|
|
+++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500
|
|
@@ -2147,8 +2147,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
|
|
else
|
|
dir="$ladir/$objdir"
|
|
@@ -2615,6 +2621,16 @@
|
|
esac
|
|
if grep "^installed=no" $deplib > /dev/null; then
|
|
path="$absdir/$objdir"
|
|
+# This interferes with crosscompilation. -CL
|
|
+# else
|
|
+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
+# if test -z "$libdir"; then
|
|
+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
|
|
+# exit 1
|
|
+# fi
|
|
+# if test "$absdir" != "$libdir"; then
|
|
+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
|
|
+# fi
|
|
else
|
|
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
|
if test -z "$libdir"; then
|
|
@@ -5165,6 +5181,10 @@
|
|
# Replace all uninstalled libtool libraries with the installed ones
|
|
newdependency_libs=
|
|
for deplib in $dependency_libs; do
|
|
+ # Replacing uninstalled with installed can easily break crosscompilation,
|
|
+ # since the installed path is generally the wrong architecture. -CL
|
|
+ newdependency_libs="$newdependency_libs $deplib"
|
|
+ continue
|
|
case $deplib in
|
|
*.la)
|
|
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
|