libtool: Extend fix-final-rpath.patch

When building upower from meta-oe, the following QA error occurred:
ERROR: QA Issue: package upower contains bad RPATH

It appears to have been caused by one of the cases fix-final-rpath.patch
is meant to address but missed. So this change fixes the additional case
that was causing upower to have the QA error.

(From OE-Core rev: d2b2bb7cedb678c9f67ef1d9170fc427d9beee1e)

Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 14 insertions, 2 deletions

diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
index 5c275ffd32..6f9d321eb3 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
@@ -6,12 +6,13 @@ This works around the issue until it gets sorted out upstream.
 
 Fix suggested by Richard Purdie <richard.purdie@intel.com>
 Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
 
 Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
 ===================================================================
 --- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
 +++ libtool-2.4.2/libltdl/config/ltmain.m4sh
-@@ -7268,9 +7268,11 @@ EOF
+@@ -7268,9 +7268,11 @@
           test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
           for libdir in $rpath; do
             if test -n "$hardcode_libdir_flag_spec"; then
@@ -25,7 +26,7 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
                 if test -z "$hardcode_libdirs"; then
                   hardcode_libdirs="$libdir"
                 else
-@@ -7999,6 +8001,10 @@ EOF
+@@ -7999,6 +8001,10 @@
        hardcode_libdirs=
        for libdir in $compile_rpath $finalize_rpath; do
         if test -n "$hardcode_libdir_flag_spec"; then
@@ -36,3 +37,14 @@ Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
           if test -n "$hardcode_libdir_separator"; then
             if test -z "$hardcode_libdirs"; then
               hardcode_libdirs="$libdir"
+@@ -8050,6 +8056,10 @@
+       hardcode_libdirs=
+       for libdir in $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"