1 files changed, 39 insertions, 0 deletions

diff --git a/recipes-devtools/binutils/binutils-linaro-2.25/libtool-rpath-fix.patch b/recipes-devtools/binutils/binutils-linaro-2.25/libtool-rpath-fix.patch
new file mode 100644
index 0000000..5240910
--- /dev/null
+++ b/recipes-devtools/binutils/binutils-linaro-2.25/libtool-rpath-fix.patch
@@ -0,0 +1,39 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+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>
+
+Forward ported to 2.25 by Koen Kooi <koen.kooi@linaro.org>
+
+--
+diff --git a/ltmain.sh b/ltmain.sh
+index 9503ec8..639f201 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -7104,6 +7104,10 @@ EOF
+          test "$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
+                if test -z "$hardcode_libdirs"; then
+                  hardcode_libdirs="$libdir"
+@@ -7799,6 +7803,10 @@ EOF
+       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"