diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-01-22 17:00:23 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-22 17:03:31 +0100 |
| commit | e4c4b805c4388ffd3c52c6ede39bf6101f430a53 (patch) | |
| tree | 0235bd724018e3c453681bf080c5c22d723305b9 /recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch | |
| parent | 68bf9ac203e3f06bc7642382c7654bc9ed8381d6 (diff) | |
| download | meta-openembedded-contrib-e4c4b805c4388ffd3c52c6ede39bf6101f430a53.tar.gz | |
binutils 2.20.1: merge in yocto fixes for 2.21.0
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch')
| -rw-r--r-- | recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch b/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch new file mode 100644 index 0000000000..a0058c1a4f --- /dev/null +++ b/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch @@ -0,0 +1,36 @@ +Enabling sysroot support in libtool exposed a bug where the final +library had an RPATH encoded into it which still pointed to the +sysroot. This works around the issue until it gets sorted out +upstream. + +Fix suggested by Richard Purdie <richard.purdie@linuxfoundation.org> +Signed-off-by: Scott Garman <scott.a.garman@intel.com> + +diff -urN binutils-2.21.orig//ltmain.sh binutils-2.21/ltmain.sh +--- binutils-2.21.orig//ltmain.sh 2011-01-18 11:50:40.821710085 -0800 ++++ binutils-2.21/ltmain.sh 2011-01-18 11:51:38.774952785 -0800 +@@ -8035,9 +8035,11 @@ + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result ++ func_stripname '=' '' "$libdir" ++ libdir=$func_stripname_result + if test -n "$hardcode_libdir_separator"; then +- func_replace_sysroot "$libdir" +- libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else +@@ -8770,6 +8772,10 @@ + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result ++ func_stripname '=' '' "$libdir" ++ libdir=$func_stripname_result + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" |