1 files changed, 11 insertions, 7 deletions

diff --git a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
index 21b3dfe306..4fcf456b0b 100644
--- a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
+++ b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
@@ -10,23 +10,24 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html]
 
 diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index 2c994612..96238350 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -7569,9 +7569,11 @@ EOF
+@@ -7654,9 +7654,11 @@ EOF
           test relink = "$opt_mode" || 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
++             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
-@@ -8301,6 +8303,10 @@ EOF
+@@ -8386,6 +8388,10 @@ EOF
        hardcode_libdirs=
        for libdir in $compile_rpath $finalize_rpath; do
         if test -n "$hardcode_libdir_flag_spec"; then
@@ -37,7 +38,7 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
           if test -n "$hardcode_libdir_separator"; then
             if test -z "$hardcode_libdirs"; then
               hardcode_libdirs=$libdir
-@@ -8352,6 +8358,10 @@ EOF
+@@ -8437,6 +8443,10 @@ EOF
        hardcode_libdirs=
        for libdir in $finalize_rpath; do
         if test -n "$hardcode_libdir_flag_spec"; then
@@ -48,3 +49,6 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
           if test -n "$hardcode_libdir_separator"; then
             if test -z "$hardcode_libdirs"; then
               hardcode_libdirs=$libdir
+-- 
+2.25.1
+