diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /libtool/libtool-1.4.3-r0/libdir.patch | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'libtool/libtool-1.4.3-r0/libdir.patch')
| -rw-r--r-- | libtool/libtool-1.4.3-r0/libdir.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/libtool/libtool-1.4.3-r0/libdir.patch b/libtool/libtool-1.4.3-r0/libdir.patch index e69de29bb2..c91f0de047 100644 --- a/libtool/libtool-1.4.3-r0/libdir.patch +++ b/libtool/libtool-1.4.3-r0/libdir.patch @@ -0,0 +1,36 @@ + +# +# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libtool-1.4.3/ltmain.sh~libdir ++++ libtool-1.4.3/ltmain.sh +@@ -2030,16 +2030,18 @@ + esac + if grep "^installed=no" $deplib > /dev/null; then + path="-L$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="-L$absdir" ++### Disabling this block to prevent picking up the libdir from .la files, ++### since it breaks crosscompilation badly. ++# 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="-L$absdir" + fi + ;; + *) continue ;; |