diff options
Diffstat (limited to 'meta/packages/libtool/libtool-1.5.10/libdir-la2.patch')
| -rw-r--r-- | meta/packages/libtool/libtool-1.5.10/libdir-la2.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch b/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch new file mode 100644 index 0000000000..0d5d261203 --- /dev/null +++ b/meta/packages/libtool/libtool-1.5.10/libdir-la2.patch | |||
| @@ -0,0 +1,64 @@ | |||
| 1 | OE changes to installed=no which means we can't run the original test | ||
| 2 | and just look in $objdir. We therefore look in both, preferring | ||
| 3 | $objdir if it exists - RP 29/11/2007 | ||
| 4 | |||
| 5 | --- libtool-1.5.10/ltmain.in.orig | ||
| 6 | +++ libtool-1.5.10/ltmain.in | ||
| 7 | @@ -3105,8 +3105,11 @@ | ||
| 8 | fi | ||
| 9 | ;; | ||
| 10 | esac | ||
| 11 | - if grep "^installed=no" $deplib > /dev/null; then | ||
| 12 | - path="$absdir/$objdir" | ||
| 13 | +# OE changes to installed=no which means we can't run the original test | ||
| 14 | +# and just look in $objdir. We therefore look in both, preferring | ||
| 15 | +# $objdir if it exists, see below. - RP 29/11/2007 | ||
| 16 | +# if grep "^installed=no" $deplib > /dev/null; then | ||
| 17 | +# path="$absdir/$objdir" | ||
| 18 | # This interferes with crosscompilation. -CL | ||
| 19 | # else | ||
| 20 | # eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
| 21 | @@ -3117,7 +3120,7 @@ | ||
| 22 | # if test "$absdir" != "$libdir"; then | ||
| 23 | # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 | ||
| 24 | # fi | ||
| 25 | - else | ||
| 26 | + if ! grep "^installed=no" $deplib > /dev/null; then | ||
| 27 | eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | ||
| 28 | if test -z "$libdir"; then | ||
| 29 | $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 | ||
| 30 | @@ -3138,9 +3141,17 @@ | ||
| 31 | for tmp in $deplibrary_names ; do | ||
| 32 | depdepl=$tmp | ||
| 33 | done | ||
| 34 | - if test -f "$path/$depdepl" ; then | ||
| 35 | - depdepl="$path/$depdepl" | ||
| 36 | + | ||
| 37 | + if test -f "$absdir/$objdir/$depdepl" ; then | ||
| 38 | + depdepl="$absdir/$objdir/$depdepl" | ||
| 39 | + path="$absdir/$objdir" | ||
| 40 | + elif test -f "$absdir/$depdepl" ; then | ||
| 41 | + depdepl="$absdir/$depdepl" | ||
| 42 | + path="$absdir" | ||
| 43 | + else | ||
| 44 | + path="$absdir/$objdir" | ||
| 45 | fi | ||
| 46 | + | ||
| 47 | # do not add paths which are already there | ||
| 48 | case " $newlib_search_path " in | ||
| 49 | *" $path "*) ;; | ||
| 50 | @@ -3150,7 +3161,13 @@ | ||
| 51 | path="" | ||
| 52 | ;; | ||
| 53 | *) | ||
| 54 | - path="-L$path" | ||
| 55 | + if test -d "$absdir/$objdir" ; then | ||
| 56 | + path="-L$absdir/$objdir" | ||
| 57 | + elif test -d "$absdir" ; then | ||
| 58 | + path="-L$absdir" | ||
| 59 | + else | ||
| 60 | + path="-L$absdir/$objdir" | ||
| 61 | + fi | ||
| 62 | ;; | ||
| 63 | esac | ||
| 64 | ;; | ||