diff options
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils/libtool-rpath-fix.patch | 38 |
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 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Enabling sysroot support in libtool exposed a bug where the final | ||
4 | library had an RPATH encoded into it which still pointed to the | ||
5 | sysroot. This works around the issue until it gets sorted out | ||
6 | upstream. | ||
7 | |||
8 | Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org> | ||
9 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
10 | |||
11 | diff -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" | ||