summaryrefslogtreecommitdiffstats
path: root/toolchain-layer/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain-layer/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch')
-rw-r--r--toolchain-layer/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/toolchain-layer/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch b/toolchain-layer/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch
deleted file mode 100644
index a0058c1a4..000000000
--- a/toolchain-layer/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Enabling sysroot support in libtool exposed a bug where the final
2library had an RPATH encoded into it which still pointed to the
3sysroot. This works around the issue until it gets sorted out
4upstream.
5
6Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org>
7Signed-off-by: Scott Garman <scott.a.garman@intel.com>
8
9diff -urN binutils-2.21.orig//ltmain.sh binutils-2.21/ltmain.sh
10--- binutils-2.21.orig//ltmain.sh 2011-01-18 11:50:40.821710085 -0800
11+++ binutils-2.21/ltmain.sh 2011-01-18 11:51:38.774952785 -0800
12@@ -8035,9 +8035,11 @@
13 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
14 for libdir in $rpath; do
15 if test -n "$hardcode_libdir_flag_spec"; then
16+ func_replace_sysroot "$libdir"
17+ libdir=$func_replace_sysroot_result
18+ func_stripname '=' '' "$libdir"
19+ libdir=$func_stripname_result
20 if test -n "$hardcode_libdir_separator"; then
21- func_replace_sysroot "$libdir"
22- libdir=$func_replace_sysroot_result
23 if test -z "$hardcode_libdirs"; then
24 hardcode_libdirs="$libdir"
25 else
26@@ -8770,6 +8772,10 @@
27 hardcode_libdirs=
28 for libdir in $compile_rpath $finalize_rpath; do
29 if test -n "$hardcode_libdir_flag_spec"; then
30+ func_replace_sysroot "$libdir"
31+ libdir=$func_replace_sysroot_result
32+ func_stripname '=' '' "$libdir"
33+ libdir=$func_stripname_result
34 if test -n "$hardcode_libdir_separator"; then
35 if test -z "$hardcode_libdirs"; then
36 hardcode_libdirs="$libdir"