diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2007-12-01 21:11:11 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-12-01 21:11:11 +0000 |
| commit | b8ba01d0e445eee967623d2cceb15955bc295e4d (patch) | |
| tree | c641988699509c158d50d56028af3a8e1a9a115e /packages/libtool/libtool-1.5.10 | |
| parent | d671d4a81e19474c5c84104e22dc3546e912afe3 (diff) | |
libtool: Sync patches from Poky. Drop uneeded tag1 patch, make sure ltmain.sh regenerates for libtool-cross, package debug files, fix nmedit references, fix library search path handling particularly on darwin.
Diffstat (limited to 'packages/libtool/libtool-1.5.10')
| -rw-r--r-- | packages/libtool/libtool-1.5.10/libdir-la2.patch | 64 | ||||
| -rw-r--r-- | packages/libtool/libtool-1.5.10/tag1.patch | 13 |
2 files changed, 64 insertions, 13 deletions
diff --git a/packages/libtool/libtool-1.5.10/libdir-la2.patch b/packages/libtool/libtool-1.5.10/libdir-la2.patch new file mode 100644 index 0000000000..0d5d261203 --- /dev/null +++ b/packages/libtool/libtool-1.5.10/libdir-la2.patch @@ -0,0 +1,64 @@ +OE changes to installed=no which means we can't run the original test +and just look in $objdir. We therefore look in both, preferring +$objdir if it exists - RP 29/11/2007 + +--- libtool-1.5.10/ltmain.in.orig ++++ libtool-1.5.10/ltmain.in +@@ -3105,8 +3105,11 @@ + fi + ;; + esac +- if grep "^installed=no" $deplib > /dev/null; then +- path="$absdir/$objdir" ++# OE changes to installed=no which means we can't run the original test ++# and just look in $objdir. We therefore look in both, preferring ++# $objdir if it exists, see below. - RP 29/11/2007 ++# 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` +@@ -3117,7 +3120,7 @@ + # if test "$absdir" != "$libdir"; then + # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 + # fi +- else ++ if ! grep "^installed=no" $deplib > /dev/null; then + 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 +@@ -3138,9 +3141,17 @@ + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then +- depdepl="$path/$depdepl" ++ ++ if test -f "$absdir/$objdir/$depdepl" ; then ++ depdepl="$absdir/$objdir/$depdepl" ++ path="$absdir/$objdir" ++ elif test -f "$absdir/$depdepl" ; then ++ depdepl="$absdir/$depdepl" ++ path="$absdir" ++ else ++ path="$absdir/$objdir" + fi ++ + # do not add paths which are already there + case " $newlib_search_path " in + *" $path "*) ;; +@@ -3150,7 +3161,13 @@ + path="" + ;; + *) +- path="-L$path" ++ if test -d "$absdir/$objdir" ; then ++ path="-L$absdir/$objdir" ++ elif test -d "$absdir" ; then ++ path="-L$absdir" ++ else ++ path="-L$absdir/$objdir" ++ fi + ;; + esac + ;; diff --git a/packages/libtool/libtool-1.5.10/tag1.patch b/packages/libtool/libtool-1.5.10/tag1.patch deleted file mode 100644 index 6fefd6266d..0000000000 --- a/packages/libtool/libtool-1.5.10/tag1.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libtool-1.5.10/libltdl/ltmain.sh -=================================================================== ---- libtool-1.5.10.orig/libltdl/ltmain.sh 2004-09-19 13:34:44.000000000 +0100 -+++ libtool-1.5.10/libltdl/ltmain.sh 2006-05-25 15:28:39.000000000 +0100 -@@ -232,7 +232,7 @@ - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit $EXIT_FAILURE -+# exit $EXIT_FAILURE - # else - # $echo "$modename: using $tagname tagged configuration" - fi |