summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-07-06 17:26:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-08 16:39:09 +0100
commit3f4f5c14ac8088d523c8c884f3dfb5f7ea1e5fdc (patch)
treea498a134a7c56bab7fe6cb7b9b37cb463b4515e6 /meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
parentcd16591d6cb5d37d027ac16211904d4d7db3033e (diff)
downloadpoky-3f4f5c14ac8088d523c8c884f3dfb5f7ea1e5fdc.tar.gz
binutils: upgrade from 2.21 to 2.21.1
(From OE-Core rev: 4810404f22d7cf8849dc32da68dd33a156cac407) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch b/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
new file mode 100644
index 0000000000..2666d311ff
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch
@@ -0,0 +1,38 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Enabling sysroot support in libtool exposed a bug where the final
4library had an RPATH encoded into it which still pointed to the
5sysroot. This works around the issue until it gets sorted out
6upstream.
7
8Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org>
9Signed-off-by: Scott Garman <scott.a.garman@intel.com>
10
11diff -urN binutils-2.21.orig//ltmain.sh binutils-2.21/ltmain.sh
12--- binutils-2.21.orig//ltmain.sh 2011-01-18 11:50:40.821710085 -0800
13+++ binutils-2.21/ltmain.sh 2011-01-18 11:51:38.774952785 -0800
14@@ -8035,9 +8035,11 @@
15 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16 for libdir in $rpath; do
17 if test -n "$hardcode_libdir_flag_spec"; then
18+ func_replace_sysroot "$libdir"
19+ libdir=$func_replace_sysroot_result
20+ func_stripname '=' '' "$libdir"
21+ libdir=$func_stripname_result
22 if test -n "$hardcode_libdir_separator"; then
23- func_replace_sysroot "$libdir"
24- libdir=$func_replace_sysroot_result
25 if test -z "$hardcode_libdirs"; then
26 hardcode_libdirs="$libdir"
27 else
28@@ -8770,6 +8772,10 @@
29 hardcode_libdirs=
30 for libdir in $compile_rpath $finalize_rpath; do
31 if test -n "$hardcode_libdir_flag_spec"; then
32+ func_replace_sysroot "$libdir"
33+ libdir=$func_replace_sysroot_result
34+ func_stripname '=' '' "$libdir"
35+ libdir=$func_stripname_result
36 if test -n "$hardcode_libdir_separator"; then
37 if test -z "$hardcode_libdirs"; then
38 hardcode_libdirs="$libdir"