diff options
| author | Chris Larson <clarson@kergoth.com> | 2003-11-21 18:27:14 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2003-11-21 18:27:14 +0000 |
| commit | e9b171e0738c2acef0650328b7f2e1ae7cdc55cc (patch) | |
| tree | 8afdd2f094195bb88a7a9636f5b9bd9f53ebb492 /libtool/libtool-1.5/libdir-la.patch | |
| parent | acea8d73cb0c72991690d488915e426bf7e46675 (diff) | |
Numerous build fixes from an oemake -a run, including two more fixes for libtool 'libdir from .la file leaking into library search path' situations.
BKrev: 3fbe5902eywlLRHkRQ1FaDS5C01-jg
Diffstat (limited to 'libtool/libtool-1.5/libdir-la.patch')
| -rw-r--r-- | libtool/libtool-1.5/libdir-la.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/libtool/libtool-1.5/libdir-la.patch b/libtool/libtool-1.5/libdir-la.patch index e69de29bb2..8112aef940 100644 --- a/libtool/libtool-1.5/libdir-la.patch +++ b/libtool/libtool-1.5/libdir-la.patch @@ -0,0 +1,62 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libtool-1.5/ltmain.in~libdir-la ++++ libtool-1.5/ltmain.in +@@ -2082,8 +2082,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" +@@ -2545,16 +2551,16 @@ + esac + if grep "^installed=no" $deplib > /dev/null; then + path="$absdir/$objdir" +- 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 +- path="$absdir" ++# 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 ++# path="$absdir" + fi + depdepl= + case $host in +@@ -5072,6 +5072,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%^.*/%%'` |