diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch')
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch new file mode 100644 index 0000000000..61517d1d4c --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils-2.20.1/binutils-libtool.patch | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | This is because libdir has a trailing slash which breaks the comparision. | ||
| 2 | |||
| 3 | RP 2/1/10 | ||
| 4 | |||
| 5 | Index: binutils-2.20.1/ltmain.sh | ||
| 6 | =================================================================== | ||
| 7 | --- binutils-2.20.1.orig/ltmain.sh 2009-09-01 00:59:32.000000000 +0800 | ||
| 8 | +++ binutils-2.20.1/ltmain.sh 2010-07-29 09:41:14.000000000 +0800 | ||
| 9 | @@ -2156,8 +2156,12 @@ | ||
| 10 | dir="$dir$objdir" | ||
| 11 | |||
| 12 | if test -n "$relink_command"; then | ||
| 13 | + # Strip any trailing slash from the destination. | ||
| 14 | + func_stripname '' '/' "$libdir" | ||
| 15 | + destlibdir=$func_stripname_result | ||
| 16 | + | ||
| 17 | # Determine the prefix the user has applied to our future dir. | ||
| 18 | - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` | ||
| 19 | + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"` | ||
| 20 | |||
| 21 | # Don't allow the user to place us outside of our expected | ||
| 22 | # location b/c this prevents finding dependent libraries that | ||
| 23 | @@ -5570,8 +5574,14 @@ | ||
| 24 | absdir="$abs_ladir" | ||
| 25 | libdir="$abs_ladir" | ||
| 26 | else | ||
| 27 | - dir="$libdir" | ||
| 28 | - absdir="$libdir" | ||
| 29 | + # Adding 'libdir' from the .la file to our library search paths | ||
| 30 | + # breaks crosscompilation horribly. We cheat here and don't add | ||
| 31 | + # it, instead adding the path where we found the .la. -CL | ||
| 32 | + dir="$abs_ladir" | ||
| 33 | + absdir="$abs_ladir" | ||
| 34 | + libdir="$abs_ladir" | ||
| 35 | + #dir="$libdir" | ||
| 36 | + #absdir="$libdir" | ||
| 37 | fi | ||
| 38 | test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes | ||
| 39 | else | ||
| 40 | @@ -5942,8 +5952,6 @@ | ||
| 41 | add="$libdir/$linklib" | ||
| 42 | fi | ||
| 43 | else | ||
| 44 | - # We cannot seem to hardcode it, guess we'll fake it. | ||
| 45 | - add_dir="-L$libdir" | ||
| 46 | # Try looking first in the location we're being installed to. | ||
| 47 | if test -n "$inst_prefix_dir"; then | ||
| 48 | case $libdir in | ||
| 49 | @@ -6089,7 +6097,17 @@ | ||
| 50 | fi | ||
| 51 | ;; | ||
| 52 | *) | ||
| 53 | - path="-L$absdir/$objdir" | ||
| 54 | + # OE sets installed=no in staging. We need to look in $objdir and $absdir, | ||
| 55 | + # preferring $objdir. RP 31/04/2008 | ||
| 56 | + if test -f "$absdir/$objdir/$depdepl" ; then | ||
| 57 | + depdepl="$absdir/$objdir/$depdepl" | ||
| 58 | + path="-L$absdir/$objdir" | ||
| 59 | + elif test -f "$absdir/$depdepl" ; then | ||
| 60 | + depdepl="$absdir/$depdepl" | ||
| 61 | + path="-L$absdir" | ||
| 62 | + else | ||
| 63 | + path="-L$absdir/$objdir" | ||
| 64 | + fi | ||
| 65 | ;; | ||
| 66 | esac | ||
| 67 | else | ||