1 files changed, 36 insertions, 0 deletions

diff --git a/meta/recipes-devtools/binutils/binutils-2.21/libtool-rpath-fix.patch b/meta/recipes-devtools/binutils/binutils-2.21/libtool-rpath-fix.patch
new file mode 100644
index 0000000000..a0058c1a4f
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.21/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"