diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2012-03-23 08:22:26 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-03-24 07:35:22 +0100 |
| commit | ff0f815593c33f1a82ba4d1cbe41e6b987da1f47 (patch) | |
| tree | 22b43fa2e84f25cc948df79f9e9de07e8ec57418 /toolchain-layer/recipes-devtools/binutils/binutils-2.20.1/libtool-rpath-fix.patch | |
| parent | 6b22bd198a87b5f113971d8fcd0e7211cd143c7d (diff) | |
| download | meta-openembedded-contrib-ff0f815593c33f1a82ba4d1cbe41e6b987da1f47.tar.gz | |
toolchain-layer: move binutils and gcc from meta-oe into here
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Eric Bénard <eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
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.patch | 36 |
1 files changed, 36 insertions, 0 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 new file mode 100644 index 0000000000..a0058c1a4f --- /dev/null +++ b/toolchain-layer/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" |