diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-06-12 18:23:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-12 18:23:30 +0000 |
| commit | 017b42a2a426c816780af98c28b30d3bfb3c67e6 (patch) | |
| tree | 0e41f9332bfdc40539f648a6cf875805d692a164 /packages/libtool/libtool-1.5/libdir-la.patch | |
| parent | c61d02e4a650528e70945aa362a76450feb2c1c5 (diff) | |
| parent | 900015f63bd5445f2895ded7b6972026528f29cb (diff) | |
merge of 318d06f263d6957b449ed1f6a10cfdda107bcceb
and 8bed42c6d1a57ad595de378d393b40c7bd3e997f
Diffstat (limited to 'packages/libtool/libtool-1.5/libdir-la.patch')
| -rw-r--r-- | packages/libtool/libtool-1.5/libdir-la.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/packages/libtool/libtool-1.5/libdir-la.patch b/packages/libtool/libtool-1.5/libdir-la.patch deleted file mode 100644 index 8112aef940..0000000000 --- a/packages/libtool/libtool-1.5/libdir-la.patch +++ /dev/null @@ -1,62 +0,0 @@ - -# -# 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%^.*/%%'` |