diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-30 08:25:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-30 08:25:30 +0000 |
| commit | cc5a8711231cd9b50748eee5753bbd4d6cfe7745 (patch) | |
| tree | c42990b5f7c40f126968c5bf49fe9e60e0146572 /meta/packages/libtool/libtool-1.5.10/libdir-la2.patch | |
| parent | f0ff6c78545758ddf4a5cd9f21feeb88f303a8ae (diff) | |
| download | openembedded-core-cc5a8711231cd9b50748eee5753bbd4d6cfe7745.tar.gz openembedded-core-cc5a8711231cd9b50748eee5753bbd4d6cfe7745.tar.bz2 openembedded-core-cc5a8711231cd9b50748eee5753bbd4d6cfe7745.tar.xz openembedded-core-cc5a8711231cd9b50748eee5753bbd4d6cfe7745.zip | |
libtool: Make sure ltmain.sh gets regenerated by libtool-cross, fix nmedit paths, fix library search paths for installed=no binaries particuarly on darwin but applies to other archs too
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3274 311d38ba-8fff-0310-9ca6-ca027cbcb966
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 000000000..0d5d26120 --- /dev/null +++ b/meta/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 + ;; |