26 files changed, 204 insertions, 662 deletions

diff --git a/meta/recipes-devtools/libtool/libtool-2.4.7.inc b/meta/recipes-devtools/libtool/libtool-2.4.7.inc
deleted file mode 100644
index 16bb10d48f..0000000000
--- a/meta/recipes-devtools/libtool/libtool-2.4.7.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-SUMMARY = "Generic library support script"
-DESCRIPTION = "This is GNU libtool, a generic library support script. \
-Libtool hides the complexity of generating special library types \
-(such as shared libraries) behind a consistent interface."
-HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
-SECTION = "devel"
-LICENSE = "GPL-2.0-only & LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c "
-
-SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
-           file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \
-           file://0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch \
-           file://0003-ltmain.in-Add-missing-sysroot-to-library-path.patch \
-           file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \
-           file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \
-           file://dont-depend-on-help2man.patch \
-           file://0003-libtool.m4-Cleanup-sysroot-trailing.patch \
-           file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \
-           file://nohardcodepaths.patch \
-           file://0007-libtool-Fix-support-for-NIOS2-processor.patch \
-           file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \
-           file://0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \
-           file://0010-Makefile.am-make-sure-autoheader-run-before-automake.patch \
-           file://0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch \
-           file://0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch \
-           file://0001-ltmain.in-Parse-additional-clang-options.patch \
-          "
-
-SRC_URI[sha256sum] = "04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8"
-
-do_compile:prepend () {
-        # Sometimes this file doesn't get rebuilt, force the issue
-        rm -f ${S}/build-aux/ltmain.sh
-        make build-aux/ltmain.sh
-        ./config.status
-}
-
-inherit autotools texinfo
-EXTRA_AUTORECONF = "--exclude=libtoolize"
-
-CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep"
-
-DEPENDS = "libtool-native"
-
-PACKAGES =+ "libltdl"
-FILES:${PN} += "${datadir}/aclocal"
-
-FILES:${PN}-dev:remove = "${datadir}/aclocal"
-FILES:libltdl = "${libdir}/libltdl${SOLIBS}"
-
-export CONFIG_SHELL="/bin/bash"
diff --git a/meta/recipes-devtools/libtool/libtool-2.5.4.inc b/meta/recipes-devtools/libtool/libtool-2.5.4.inc
new file mode 100644
index 0000000000..4d9a822de2
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool-2.5.4.inc
@@ -0,0 +1,36 @@
+SUMMARY = "Generic library support script"
+DESCRIPTION = "This is GNU libtool, a generic library support script. \
+Libtool hides the complexity of generating special library types \
+(such as shared libraries) behind a consistent interface."
+HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
+SECTION = "devel"
+LICENSE = "GPL-2.0-only & LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \
+    file://libltdl/COPYING.LIB;md5=4bf661c1e3793e55c8d1051bc5e0ae21 "
+
+SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
+           file://0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \
+           file://0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \
+           file://0003-libtool-remove-help2man-dependency.patch \
+           file://0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch \
+           file://0005-libtool-Check-for-static-libs-for-internal-compiler-.patch \
+           file://0006-libtool-Fix-tools-path-issues.patch \
+           file://0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch \
+          "
+
+SRC_URI[sha256sum] = "da8ebb2ce4dcf46b90098daf962cffa68f4b4f62ea60f798d0ef12929ede6adf"
+
+inherit autotools texinfo
+EXTRA_AUTORECONF = "--exclude=libtoolize"
+
+CACHED_CONFIGUREVARS += "ac_cv_path_GREP=grep"
+
+DEPENDS = "libtool-native"
+
+PACKAGES =+ "libltdl"
+FILES:${PN} += "${datadir}/aclocal"
+
+FILES:${PN}-dev:remove = "${datadir}/aclocal"
+FILES:libltdl = "${libdir}/libltdl${SOLIBS}"
+
+export CONFIG_SHELL = "/bin/bash"
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.4.bb
index 93f1dd7825..33ea706adb 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.5.4.bb
@@ -1,19 +1,12 @@
 require libtool-${PV}.inc
 
 PACKAGES = ""
-SRC_URI += "file://fixinstall.patch"
+SRC_URI += "file://0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch"
 
 datadir = "${STAGING_DIR_TARGET}${target_datadir}"
 
 inherit nopackages
 
-do_configure:prepend () {
-        # Remove any existing libtool m4 since old stale versions would break
-        # any upgrade
-        rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
-        rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
-}
-
 #
 # ccache may or may not be INHERITED, we remove references to it so the sstate
 # artefact works on a machine where its not present. libtool-cross isn't used
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb
deleted file mode 100644
index 19024f7830..0000000000
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require libtool-${PV}.inc
-
-DEPENDS = ""
-
-inherit native
-
-EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}"
-
-do_configure:prepend () {
-        # Remove any existing libtool m4 since old stale versions would break
-        # any upgrade
-        rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
-        rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
-}
-
-do_install () {
-        autotools_do_install
-        install -d ${D}${bindir}/
-        install -m 0755 libtool ${D}${bindir}/libtool
-}
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.4.bb
new file mode 100644
index 0000000000..be96b52dd6
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool-native_2.5.4.bb
@@ -0,0 +1,11 @@
+require libtool-${PV}.inc
+
+DEPENDS = ""
+
+inherit native
+
+do_install () {
+        autotools_do_install
+        install -d ${D}${bindir}/
+        install -m 0755 libtool ${D}${bindir}/libtool
+}
diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch
deleted file mode 100644
index 51c0c52da8..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Subject: [PATCH 01/12] ltmain.in: Handle trailing slashes on install commands correctly
-
-A command like:
-
-libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/image/usr/lib/gnome-keyring/standalone/'
-
-where the path ends with a trailing slash currently fails. This occurs in
-software like gnome-keyring or pulseaudio and is because the comparision
-code doesn't see the paths as equal. Strip both paths to ensure this works
-reliably.
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html]
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index a5f21a1..f884824 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -2381,8 +2381,14 @@ func_mode_install ()
-        func_append dir "$objdir"
- 
-        if test -n "$relink_command"; then
-+         # Strip any trailing slash from the destination.
-+         func_stripname '' '/' "$libdir"
-+         destlibdir=$func_stripname_result
-+         func_stripname '' '/' "$destdir"
-+         s_destdir=$func_stripname_result
-+
-          # Determine the prefix the user has applied to our future dir.
--         inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-+         inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
- 
-          # Don't allow the user to place us outside of our expected
-          # location b/c this prevents finding dependent libraries that
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch
deleted file mode 100644
index c52083327c..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-ltmain.in: Parse additional clang options
-
-clang uses -rtlib and --unwindlib to select proper compiler
-runtime in some cases. Therefore pass these options to linker when found in
-ldflags
-
-* build-aux/ltmain.in: Handle clang linker options
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=725646bf095bf5c07c49ae38dd060f95bd95ae3c]
-
----
- build-aux/ltmain.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 037f009..ba5c816 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5414,10 +5414,12 @@ func_mode_link ()
-       # -fsanitize=*         Clang/GCC memory and address sanitizer
-       # -fuse-ld=*           Linker select flags for GCC
-       # -f{file|debug|macro|profile}-prefix-map* needed for lto linking
-+      # -rtlib=*             select c runtime lib with clang
-+      # --unwindlib=*        select unwinder library with clang
-       # -Wa,*                Pass flags directly to the assembler
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-rtlib=*|--unwindlib=*| \
-       -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*)
-         func_quote_arg pretty "$arg"
-        arg=$func_quote_arg_result
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/0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
index 9203302182..bcffb7d1ae 100644
--- a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
+++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch
@@ -1,5 +1,7 @@
+From 16354097285634daf0240d428bc49fba95c3a291 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Subject: [PATCH 04/12] ltmain.sh: Fix sysroot paths being encoded into RPATHs
+Date: Tue, 26 Nov 2024 09:57:35 +0000
+Subject: [PATCH 1/7] ltmain.sh: Fix sysroot paths being encoded into RPATHs
 
 There is a bug where RPATHs could end up containing sysroot values when
 cross compiling which is obviously incorrect. Strip out sysroot components
@@ -8,12 +10,15 @@ from libdir when building RPATH values to avoid this.
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 
 Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html]
+---
+ build-aux/ltmain.in | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 25a91de..40cb94a 100644
+index fa157775..c31faebd 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -7682,9 +7682,11 @@ EOF
+@@ -7764,9 +7764,11 @@ func_mode_link ()
           test relink = "$opt_mode" || rpath=$compile_rpath$rpath
           for libdir in $rpath; do
             if test -n "$hardcode_libdir_flag_spec"; then
@@ -27,7 +32,7 @@ index 25a91de..40cb94a 100644
                 if test -z "$hardcode_libdirs"; then
                   hardcode_libdirs=$libdir
                 else
-@@ -8414,6 +8416,10 @@ EOF
+@@ -8496,6 +8498,10 @@ func_mode_link ()
        hardcode_libdirs=
        for libdir in $compile_rpath $finalize_rpath; do
         if test -n "$hardcode_libdir_flag_spec"; then
@@ -38,7 +43,7 @@ index 25a91de..40cb94a 100644
           if test -n "$hardcode_libdir_separator"; then
             if test -z "$hardcode_libdirs"; then
               hardcode_libdirs=$libdir
-@@ -8465,6 +8471,10 @@ EOF
+@@ -8547,6 +8553,10 @@ func_mode_link ()
        hardcode_libdirs=
        for libdir in $finalize_rpath; do
         if test -n "$hardcode_libdir_flag_spec"; then
@@ -50,5 +55,5 @@ index 25a91de..40cb94a 100644
             if test -z "$hardcode_libdirs"; then
               hardcode_libdirs=$libdir
 -- 
-2.25.1
+2.39.5
 
diff --git a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch
deleted file mode 100644
index 2126f82953..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From: Khem Raj <raj.khem@gmail.com>
-Subject: [PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conflict with gcc/binutils
-
-This patch renames the --with-sysroot option to --with-libtool-sysroot
-to avoid namespace conflict with binutils, gcc and other toolchain
-components since these componets also add that option to configure
-and this becomes confusing and conflicting otherwise.
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Upstream report:
-http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html]
-
-Index: libtool-2.4.7/m4/libtool.m4
-===================================================================
---- libtool-2.4.7.orig/m4/libtool.m4
-+++ libtool-2.4.7/m4/libtool.m4
-@@ -1244,28 +1244,28 @@ _LT_DECL([], [ECHO], [1], [An echo progr
- AC_DEFUN([_LT_WITH_SYSROOT],
- [m4_require([_LT_DECL_SED])dnl
- AC_MSG_CHECKING([for sysroot])
--AC_ARG_WITH([sysroot],
--[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
-+AC_ARG_WITH([libtool-sysroot],
-+[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@],
-   [Search for dependent libraries within DIR (or the compiler's sysroot
-    if not specified).])],
--[], [with_sysroot=no])
-+[], [with_libtool_sysroot=no])
- 
- dnl lt_sysroot will always be passed unquoted.  We quote it here
- dnl in case the user passed a directory name.
- lt_sysroot=
--case $with_sysroot in #(
-+case $with_libtool_sysroot in #(
-  yes)
-    if test yes = "$GCC"; then
-      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-    fi
-    ;; #(
-  /*)
--   lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
-+   lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"`
-    ;; #(
-  no|'')
-    ;; #(
-  *)
--   AC_MSG_RESULT([$with_sysroot])
-+   AC_MSG_RESULT([$with_libtool_sysroot])
-    AC_MSG_ERROR([The sysroot must be an absolute path.])
-    ;;
- esac
-Index: libtool-2.4.7/tests/sysroot.at
-===================================================================
---- libtool-2.4.7.orig/tests/sysroot.at
-+++ libtool-2.4.7/tests/sysroot.at
-@@ -65,7 +65,7 @@ while read file; do
- done])
- 
- LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
--configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
-+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
- 
- #???
- if test PATH = "$shlibpath_var"; then
-@@ -115,7 +115,7 @@ AM_INIT_AUTOMAKE([foreign])
- AC_PROG_CC
- AC_CONFIG_SRCDIR([lib2.c])
- LT_INIT
--sysroot=$with_sysroot
-+sysroot=$with_libtool_sysroot
- AC_SUBST([sysroot])
- AC_OUTPUT(Makefile)
- ]])
-@@ -156,7 +156,7 @@ AM_INIT_AUTOMAKE([foreign])
- AC_PROG_CC
- AC_CONFIG_SRCDIR([prog.c])
- LT_INIT
--sysroot=$with_sysroot
-+sysroot=$with_libtool_sysroot
- AC_SUBST([sysroot])
- AC_OUTPUT(Makefile)
- ]])
-diff --git a/tests/testsuite b/tests/testsuite
-index 24265e4..d388e3e 100755
---- a/tests/testsuite
-+++ b/tests/testsuite
-@@ -48997,7 +48997,7 @@ $at_traceon; }
- 
- 
- LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
--configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
-+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
- 
- #???
- if test PATH = "$shlibpath_var"; then
-@@ -49211,7 +49211,7 @@ AM_INIT_AUTOMAKE([foreign])
- AC_PROG_CC
- AC_CONFIG_SRCDIR([lib2.c])
- LT_INIT
--sysroot=$with_sysroot
-+sysroot=$with_libtool_sysroot
- AC_SUBST([sysroot])
- AC_OUTPUT(Makefile)
- _ATEOF
-@@ -49404,7 +49404,7 @@ AM_INIT_AUTOMAKE([foreign])
- AC_PROG_CC
- AC_CONFIG_SRCDIR([prog.c])
- LT_INIT
--sysroot=$with_sysroot
-+sysroot=$with_libtool_sysroot
- AC_SUBST([sysroot])
- AC_OUTPUT(Makefile)
- _ATEOF
-@@ -49761,7 +49761,7 @@ $at_traceon; }
- 
- 
- LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
--configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
-+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
- 
- #???
- if test PATH = "$shlibpath_var"; then
-@@ -49975,7 +49975,7 @@ AM_INIT_AUTOMAKE([foreign])
- AC_PROG_CC
- AC_CONFIG_SRCDIR([lib2.c])
- LT_INIT
--sysroot=$with_sysroot
-+sysroot=$with_libtool_sysroot
- AC_SUBST([sysroot])
- AC_OUTPUT(Makefile)
- _ATEOF
-@@ -50168,7 +50168,7 @@ AM_INIT_AUTOMAKE([foreign])
- AC_PROG_CC
- AC_CONFIG_SRCDIR([prog.c])
- LT_INIT
--sysroot=$with_sysroot
-+sysroot=$with_libtool_sysroot
- AC_SUBST([sysroot])
- AC_OUTPUT(Makefile)
- _ATEOF
-@@ -50525,7 +50525,7 @@ $at_traceon; }
- 
- 
- LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
--configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
-+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
- 
- #???
- if test PATH = "$shlibpath_var"; then
-@@ -50739,7 +50739,7 @@ AM_INIT_AUTOMAKE([foreign])
- AC_PROG_CC
- AC_CONFIG_SRCDIR([lib2.c])
- LT_INIT
--sysroot=$with_sysroot
-+sysroot=$with_libtool_sysroot
- AC_SUBST([sysroot])
- AC_OUTPUT(Makefile)
- _ATEOF
-@@ -50932,7 +50932,7 @@ AM_INIT_AUTOMAKE([foreign])
- AC_PROG_CC
- AC_CONFIG_SRCDIR([prog.c])
- LT_INIT
--sysroot=$with_sysroot
-+sysroot=$with_libtool_sysroot
- AC_SUBST([sysroot])
- AC_OUTPUT(Makefile)
- _ATEOF
diff --git a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch b/meta/recipes-devtools/libtool/libtool/0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch
index 8b6352b01b..2ece455969 100644
--- a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch
+++ b/meta/recipes-devtools/libtool/libtool/0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch
@@ -1,5 +1,8 @@
+From 59b6032698d10306ffb3be3cbf76690409d7f9a6 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Subject: [PATCH 05/12] ltmain.in: Don't encode RATHS which match default linker paths
+Date: Tue, 26 Nov 2024 09:57:36 +0000
+Subject: [PATCH 2/7] ltmain.in: Don't encode RATHS which match default linker
+ paths
 
 We don't want to add RPATHS which match default linker search paths, they're
 a waste of space. This patch filters libtools list of paths to encoode and
@@ -11,12 +14,15 @@ the paths before comparision.
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 
 Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html]
+---
+ build-aux/ltmain.in | 34 ++++++++++++++++++++++++++++------
+ 1 file changed, 28 insertions(+), 6 deletions(-)
 
 diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 40cb94a..2fa055e 100644
+index c31faebd..44c7d81e 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -7700,8 +7700,16 @@ EOF
+@@ -7782,8 +7782,16 @@ func_mode_link ()
                   esac
                 fi
               else
@@ -35,7 +41,7 @@ index 40cb94a..2fa055e 100644
               fi
             elif test -n "$runpath_var"; then
               case "$perm_rpath " in
-@@ -8434,8 +8442,16 @@ EOF
+@@ -8516,8 +8524,16 @@ func_mode_link ()
               esac
             fi
           else
@@ -54,7 +60,7 @@ index 40cb94a..2fa055e 100644
           fi
         elif test -n "$runpath_var"; then
           case "$perm_rpath " in
-@@ -8489,8 +8505,14 @@ EOF
+@@ -8571,8 +8587,14 @@ func_mode_link ()
               esac
             fi
           else
@@ -72,5 +78,5 @@ index 40cb94a..2fa055e 100644
         elif test -n "$runpath_var"; then
           case "$finalize_perm_rpath " in
 -- 
-2.25.1
+2.39.5
 
diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch
index 0013d16544..b174827eef 100644
--- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch
+++ b/meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch
@@ -1,13 +1,21 @@
+From e3e8422333239c47ad613e2f41ee04244556d3be Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <cazfi74@gmail.com>
+Date: Mon, 7 Jan 2013 01:49:28 +0200
+Subject: [PATCH 3/7] libtool: remove help2man dependency
+
 Upstream-Status: Inappropriate
 
 Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
 Updated by: Robert Yang <liezhi.yang@windriver.com>
+---
+ Makefile.am | 17 -----------------
+ 1 file changed, 17 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 7bd7f72..c29860e 100644
+index 51c1fbdb..4962c3ad 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -411,21 +411,6 @@ $(notes_txt): $(notes_texi)
+@@ -408,23 +408,6 @@ $(notes_txt): $(notes_texi)
         $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \
             $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'
  
@@ -22,10 +30,15 @@ index 7bd7f72..c29860e 100644
 -# manual pages if the sources for the build-tree files we want to
 -# run have changed.
 -$(libtool_1): $(ltmain_sh)
--       $(AM_V_GEN)$(update_mans) --help-option=--help-all libtool
+-       $(AM_V_GEN)$(update_mans) -n 'Provide generalized library-building support services' --help-option=--help-all libtool
 -$(libtoolize_1): $(libtoolize_in)
--       $(AM_V_GEN)$(update_mans) libtoolize
+-       $(AM_V_GEN)$(update_mans) -n 'Prepare a package to use libtool' libtoolize
+-
+-
 -
- 
  ## ------------- ##
  ## Installation. ##
+ ## ------------- ##
+-- 
+2.39.5
+
diff --git a/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch b/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch
deleted file mode 100644
index 6d922382ef..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0003-libtool.m4-Cleanup-sysroot-trailing.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-libtool.m4: Cleanup sysroot trailing "/"
-
-If $CC has --sysroot=/, it is a valid configuration however libtool will
-then set lt_sysroot to "/".
-
-This means references like $lt_sysroot$libdir become //usr/lib instead
-of the more normally expected /usr/lib. This may or may not break something
-but certainly is confusing to the user and gives confusing output. Making
-"/" simply unset lt_sysroot is much cleaner.
-
-Whilst here, trim any trailing '/' from sysroot paths to drop the duplication
-and result in cleaner/consistent output.
-
-* m4/libtool.m4: Cleanup sysroot trailing '/' handling
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=365805327c7b9bbdb0e622b954b6b0d8eaeb3f99]
-Signed-off-by:  Richard Purdie <richard.purdie@linuxfoundation.org>
-
----
- m4/libtool.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index fa1ae91..2f31d24 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -1256,7 +1256,9 @@ lt_sysroot=
- case $with_libtool_sysroot in #(
-  yes)
-    if test yes = "$GCC"; then
--     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-+     # Trim trailing / since we'll always append absolute paths and we want
-+     # to avoid //, if only for less confusing output for the user.
-+     lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'`
-    fi
-    ;; #(
-  /*)
diff --git a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch
deleted file mode 100644
index 35f48ef906..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Khem Raj <raj.khem@gmail.com>
-Subject: [PATCH 03/12] ltmain.in: Add missing sysroot to library path
-
-When using a sysroot we should append it to libdir, which is helpful in
-cross builds as the system is staged in the sysroot. For normal builds,
-i.e. when lt_sysroot is not set, it will still behave the same and add
--L/usr/lib to the relink command.
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html]
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index f884824..25a91de 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -6503,7 +6503,7 @@ func_mode_link ()
-              fi
-            else
-              # We cannot seem to hardcode it, guess we'll fake it.
--             add_dir=-L$libdir
-+             add_dir="-L$lt_sysroot$libdir"
-              # Try looking first in the location we're being installed to.
-              if test -n "$inst_prefix_dir"; then
-                case $libdir in
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch b/meta/recipes-devtools/libtool/libtool/0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch
index c104e904cc..e8fc1bff9c 100644
--- a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch
+++ b/meta/recipes-devtools/libtool/libtool/0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch
@@ -1,23 +1,25 @@
-libtool.m4: Change libtool to handle sysroots by default
+From 3bb376ff4832e2bd1aaee5530b4b926e3f7407c0 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Sat, 14 Sep 2013 09:01:38 +0000
+Subject: [PATCH 4/7] libtool.m4: Change libtool to handle sysroots by default
 
 Rather than using no sysroot by default, always query gcc to obtain the sysroot.
 
 Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
 
 Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of default]
-
 ---
  m4/libtool.m4 | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index 2f31d24..bd90775 100644
+index 8d323b3e..3650c87c 100644
 --- a/m4/libtool.m4
 +++ b/m4/libtool.m4
-@@ -1254,18 +1254,18 @@ dnl lt_sysroot will always be passed unquoted.  We quote it here
+@@ -1288,18 +1288,18 @@ dnl lt_sysroot will always be passed unquoted.  We quote it here
  dnl in case the user passed a directory name.
  lt_sysroot=
- case $with_libtool_sysroot in #(
+ case $with_sysroot in #(
 - yes)
 + no)
     if test yes = "$GCC"; then
@@ -29,10 +31,13 @@ index 2f31d24..bd90775 100644
 + yes|''|/)
 +   ;; #(
   /*)
-    lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"`
+    lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"`
     ;; #(
 - no|'')
 -   ;; #(
   *)
-    AC_MSG_RESULT([$with_libtool_sysroot])
+    AC_MSG_RESULT([$with_sysroot])
     AC_MSG_ERROR([The sysroot must be an absolute path.])
+-- 
+2.39.5
+
diff --git a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0005-libtool-Check-for-static-libs-for-internal-compiler-.patch
index c151c3b481..5a4411c8e5 100644
--- a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch
+++ b/meta/recipes-devtools/libtool/libtool/0005-libtool-Check-for-static-libs-for-internal-compiler-.patch
@@ -1,5 +1,8 @@
+From 9f16cd0624641e489665415150792d9054af8a7a Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
-Subject: [PATCH 08/12] libtool: Check for static libs for internal compiler libraries
+Date: Tue, 26 Nov 2024 09:57:39 +0000
+Subject: [PATCH 5/7] libtool: Check for static libs for internal compiler
+ libraries
 
 Libtool checks only for libraries linked as -l* when trying to
 find internal compiler libraries. Clang, however uses the absolute
@@ -14,20 +17,23 @@ https://crbug.com/749263
 https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866
 
 Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html]
+---
+ m4/libtool.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index bd90775..3794130 100644
+index 3650c87c..51493a10 100644
 --- a/m4/libtool.m4
 +++ b/m4/libtool.m4
-@@ -7556,7 +7556,7 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -7708,7 +7708,7 @@ if AC_TRY_EVAL(ac_compile); then
    for p in `eval "$output_verbose_link_cmd"`; do
      case $prev$p in
  
 -    -L* | -R* | -l*)
 +    -L* | -R* | -l* | */libclang_rt.*.a)
-        # Some compilers place space between "-{L,R}" and the path.
+        # Some compilers place space between "-{L,R,l}" and the path.
         # Remove the space.
-        if test x-L = "$p" ||
+        if test x-L = x"$p" ||
 -- 
-2.25.1
+2.39.5
 
diff --git a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch b/meta/recipes-devtools/libtool/libtool/0006-libtool-Fix-tools-path-issues.patch
index fcbce7286b..9788433ab8 100644
--- a/meta/recipes-devtools/libtool/libtool/nohardcodepaths.patch
+++ b/meta/recipes-devtools/libtool/libtool/0006-libtool-Fix-tools-path-issues.patch
@@ -1,3 +1,8 @@
+From c04839effba0538c982422275c5cda5947aa0e85 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Tue, 3 Feb 2015 14:24:58 +0000
+Subject: [PATCH 6/7] libtool: Fix tools path issues
+
 If for example you build on a machine with /bin/grep, then restore that sstate
 onto a machine with /usr/bin/grep, things will fail. Simply don't bother
 hardcoding paths.
@@ -5,11 +10,14 @@ hardcoding paths.
 RP 2015/2/3
 
 Upstream-Status: Inappropriate
+---
+ libtoolize.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
-Index: libtool-2.4.5/libtoolize.in
-===================================================================
---- libtool-2.4.5.orig/libtoolize.in
-+++ libtool-2.4.5/libtoolize.in
+diff --git a/libtoolize.in b/libtoolize.in
+index 6c15aa57..8beb670e 100644
+--- a/libtoolize.in
++++ b/libtoolize.in
 @@ -40,11 +40,11 @@
  
  : ${AUTOCONF="autoconf"}
@@ -27,3 +35,6 @@ Index: libtool-2.4.5/libtoolize.in
  
  
  ## -------------------------- ##
+-- 
+2.39.5
+
diff --git a/meta/recipes-devtools/libtool/libtool/multilib.patch b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch
index 018f066652..bcb372bbc1 100644
--- a/meta/recipes-devtools/libtool/libtool/multilib.patch
+++ b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch
@@ -1,3 +1,8 @@
+From 083cf39140cd894ea306b67411d6088c13a9e286 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Mon, 30 Jul 2018 17:00:01 +0000
+Subject: [PATCH 7/7] libtool: Fix problem with libtoolize in multilib
+
 Without this patch /usr/bin/libtoolize is different for each multilib
 since their host-triplets are different, despite there being no difference in
 the functionality of libtoolize itself.
@@ -7,17 +12,23 @@ libXX-libtool couldn't be installed into the same system.
 
 Upstream-Status: Inappropriate
 RP 2018/7/30
+---
+ libtoolize.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: libtool-2.4.6/libtoolize.in
-===================================================================
---- libtool-2.4.6.orig/libtoolize.in
-+++ libtool-2.4.6/libtoolize.in
-@@ -113,7 +113,7 @@ You must 'cd' to the top directory of yo
+diff --git a/libtoolize.in b/libtoolize.in
+index 8beb670e..c89a093c 100644
+--- a/libtoolize.in
++++ b/libtoolize.in
+@@ -139,7 +139,7 @@ You must 'cd' to the top directory of your package before you run
  When reporting a bug, please describe a test case to reproduce it and
  include the following information:
  
 -       host-triplet:   @host_triplet@
 +       host-triplet    <redacted>
-        version:        $progname (GNU @PACKAGE@) @VERSION@
+        version:        $progname $scriptversion
         automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
         autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+-- 
+2.39.5
+
diff --git a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch
deleted file mode 100644
index 676ce7fd1b..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-libtool: Fix support for NIOS2 processor
-
-The name of the system contains the string "nios2". This string
-is caught by the some of the greedy checks for OS/2 in libtool,
-in particular the *os2* branches of switch statements match for
-the nios2 string, which results in incorrect behavior of libtool.
-
-Switch to use $host_os instead of $host and tweak the patterns to
-match to avoid this problem for nios2.
-
-* build-aux/ltmain.in: Fix NIOS2 support
----
- build-aux/ltmain.in | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Submitted: https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00021.html
-Reworked and submitted: https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00068.html
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=49e6cb0d4dfdca2a59b909dc4532fe22dbc57ad5]
-
-Index: libtool-2.4.7/build-aux/ltmain.in
-===================================================================
---- libtool-2.4.7.orig/build-aux/ltmain.in
-+++ libtool-2.4.7/build-aux/ltmain.in
-@@ -518,10 +518,10 @@ libtool_validate_options ()
-     # preserve --debug
-     test : = "$debug_cmd" || func_append preserve_args " --debug"
- 
--    case $host in
-+    case $host_os in
-       # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
-       # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
--      *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
-+      cygwin* | mingw* | pw32* | cegcc* | solaris2* | os2*)
-         # don't eliminate duplications in $postdeps and $predeps
-         opt_duplicate_compiler_generated_deps=:
-         ;;
-@@ -6273,8 +6273,8 @@ func_mode_link ()
-        fi
-        if test -n "$library_names" &&
-           { test no = "$use_static_libs" || test -z "$old_library"; }; then
--         case $host in
--         *cygwin* | *mingw* | *cegcc* | *os2*)
-+         case $host_os in
-+         cygwin* | mingw* | cegcc* | os2*)
-              # No point in relinking DLLs because paths are not encoded
-              func_append notinst_deplibs " $lib"
-              need_relink=no
-@@ -6343,8 +6343,8 @@ func_mode_link ()
-              soname=$dlname
-            elif test -n "$soname_spec"; then
-              # bleh windows
--             case $host in
--             *cygwin* | mingw* | *cegcc* | *os2*)
-+             case $host_os in
-+             cygwin* | mingw* | cegcc* | os2*)
-                func_arith $current - $age
-                major=$func_arith_result
-                versuffix=-$major
diff --git a/meta/recipes-devtools/libtool/libtool/fixinstall.patch b/meta/recipes-devtools/libtool/libtool/0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch
index 48330d82fb..267c3ab140 100644
--- a/meta/recipes-devtools/libtool/libtool/fixinstall.patch
+++ b/meta/recipes-devtools/libtool/libtool/0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch
@@ -1,5 +1,10 @@
+From 78eac8c99451681f4c403b3ea727ee61651a3c1a Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 16 Nov 2011 16:58:34 +0000
+Subject: [PATCH] libtool: Avoid relinking when cross compiling, its pointless
+
 There is no point in having "executable" binaries in the .libs
-directory linked with different rpaths to the target which 
+directory linked with different rpaths to the target which
 could concivably be run on the build system when cross compiling.
 
 This patch removes the extra rpaths ($compile_rpath) so that the
@@ -17,11 +22,15 @@ Upstream-Status: Inappropriate [upstream are unlikely to take a patch like this]
 RP 2011/11/16
 
 Updated by: Robert Yang <liezhi.yang@windriver.com>
+---
+ build-aux/ltmain.in | 56 ++++++++++++++++++++++-----------------------
+ 1 file changed, 28 insertions(+), 28 deletions(-)
 
 diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index fa157775..816ea5a0 100644
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -2355,7 +2355,7 @@ func_mode_install ()
+@@ -2513,7 +2513,7 @@ func_mode_install ()
         dir=$func_dirname_result
         func_append dir "$objdir"
  
@@ -29,8 +38,8 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
 +       if test "$fast_install" = no && test -n "$relink_command"; then
           # Strip any trailing slash from the destination.
           func_stripname '' '/' "$libdir"
-          destlibdir=$func_stripname_result
-@@ -2394,7 +2394,7 @@ func_mode_install ()
+          destlibdir=$func_stripname_result
+@@ -2552,7 +2552,7 @@ func_mode_install ()
           shift
  
           srcname=$realname
@@ -39,57 +48,69 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
  
           # Install the shared library and build the symlinks.
           func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-@@ -6162,15 +6162,15 @@ func_mode_link ()
+@@ -6411,18 +6411,18 @@ func_mode_link ()
             # Hardcode the library path.
             # Skip directories that are in the system default run-time
             # search path.
 -           case " $sys_lib_dlsearch_path " in
 -           *" $absdir "*) ;;
 -           *)
--             case "$compile_rpath " in
+-             case "$compile_rpath$compile_rpath_tail " in
 -             *" $absdir "*) ;;
--             *) func_append compile_rpath " $absdir" ;;
+-             *) case $absdir in
+-                 "$progdir/"*) func_append compile_rpath " $absdir" ;;
+-                 *) func_append compile_rpath_tail " $absdir" ;;
+-                esac
 -             esac
 -             ;;
 -           esac
 +           #case " $sys_lib_dlsearch_path " in
 +           #*" $absdir "*) ;;
 +           #*)
-+           #  case "$compile_rpath " in
++           #  case "$compile_rpath$compile_rpath_tail " in
 +           #  *" $absdir "*) ;;
-+           #  *) func_append compile_rpath " $absdir" ;;
++           #  *) case $absdir in
++            #     "$progdir/"*) func_append compile_rpath " $absdir" ;;
++            #     *) func_append compile_rpath_tail " $absdir" ;;
++       #        esac
 +           #  esac
 +           #  ;;
 +           #esac
             case " $sys_lib_dlsearch_path " in
             *" $libdir "*) ;;
             *)
-@@ -6236,15 +6236,15 @@ func_mode_link ()
+@@ -6488,18 +6488,18 @@ func_mode_link ()
             # Hardcode the library path.
             # Skip directories that are in the system default run-time
             # search path.
 -           case " $sys_lib_dlsearch_path " in
 -           *" $absdir "*) ;;
 -           *)
--             case "$compile_rpath " in
+-             case "$compile_rpath$compile_rpath_tail " in
 -             *" $absdir "*) ;;
--             *) func_append compile_rpath " $absdir" ;;
+-             *) case $absdir in
+-                 "$progdir/"*) func_append compile_rpath " $absdir" ;;
+-                 *) func_append compile_rpath_tail " $absdir" ;;
+-                esac
 -             esac
 -             ;;
 -           esac
 +           #case " $sys_lib_dlsearch_path " in
 +           #*" $absdir "*) ;;
 +           #*)
-+           #  case "$compile_rpath " in
++           #  case "$compile_rpath$compile_rpath_tail " in
 +           #  *" $absdir "*) ;;
-+           #  *) func_append compile_rpath " $absdir" ;;
++           #  *) case $absdir in
++            #     "$progdir/"*) func_append compile_rpath " $absdir" ;;
++            #     *) func_append compile_rpath_tail " $absdir" ;;
++       #        esac
 +           #  esac
 +           #  ;;
 +           #esac
             case " $sys_lib_dlsearch_path " in
             *" $libdir "*) ;;
             *)
-@@ -6590,8 +6590,8 @@ func_mode_link ()
+@@ -6843,8 +6843,8 @@ func_mode_link ()
                   eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                   test -z "$libdir" && \
                     func_fatal_error "'$deplib' is not a valid libtool archive"
@@ -100,3 +121,6 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
  
                   path=-L$absdir
                 fi
+-- 
+2.39.5
+
diff --git a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch b/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch
deleted file mode 100644
index f51deecbef..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Mingli Yu <mingli.yu@windriver.com>
-Subject: [PATCH 09/12] Makefile.am: make sure autoheader run before autoconf
-
-autoheader will update ../libtool-2.4.6/libltdl/config-h.in which
-autoconf needs, so there comes a race sometimes as below:
- | configure.ac:45: error: required file 'config-h.in' not found
- | touch '../libtool-2.4.6/libltdl/config-h.in'
-
-So make sure autoheader run before autoconf to avoid this race.
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e7dc729dd27b367905cd0ce52b5466d91537857a]
-
-diff --git a/Makefile.am b/Makefile.am
-index c29860e..9c34bfd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps)
- $(lt_aclocal_m4): $(lt_aclocal_m4_deps)
-        $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I ../m4
- 
--$(lt_configure): $(lt_configure_deps)
-+$(lt_configure): $(lt_configure_deps) $(lt_config_h_in)
-        $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOCONF)
- 
- $(lt_config_h_in): $(lt_configure_deps)
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch b/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch
deleted file mode 100644
index e451de59e3..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Mingli Yu <mingli.yu@windriver.com>
-Subject: [PATCH 10/12] Makefile.am: make sure autoheader run before automake
-
-When use automake to generate Makefile.in from Makefile.am, there
-comes below race:
- | configure.ac:45: error: required file 'config-h.in' not found
-
-It is because the file config-h.in in updating process by autoheader,
-so make automake run after autoheader to avoid the above race.
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=e01c0bfe5e041418d84460901a1a5b11b89d596f]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
-
-diff --git a/Makefile.am b/Makefile.am
-index 9c34bfd..231ef3f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -333,7 +333,7 @@ EXTRA_DIST     += $(lt_aclocal_m4) \
-                  $(lt_obsolete_m4) \
-                  $(stamp_mk)
- 
--$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4)
-+$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) $(lt_config_h_in)
-        $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOMAKE) Makefile
- 
- # Don't let unused scripts leak into the libltdl Makefile
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch b/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch
deleted file mode 100644
index 4c6b6f05b4..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-ltmain.in: Handle prefix-map compiler options correctly
-
-If lto is enabled, we need the prefix-map variables to be passed to the linker
-to correctly link the objects using correctly mapped paths.
-
-Add these to the list of options libtool passes through.
-
-* build-aux/ltmain.in: Handle prefix-map compiler options
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html
-https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00066.html
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=cdf4bf702f11d17e06569936e8a433a77f791228]
-
----
- build-aux/ltmain.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
-index 0a50f5b..037f009 100644
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -5413,11 +5413,12 @@ func_mode_link ()
-       # -stdlib=*            select c++ std lib with clang
-       # -fsanitize=*         Clang/GCC memory and address sanitizer
-       # -fuse-ld=*           Linker select flags for GCC
-+      # -f{file|debug|macro|profile}-prefix-map* needed for lto linking
-       # -Wa,*                Pass flags directly to the assembler
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
--      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
-+      -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*)
-         func_quote_arg pretty "$arg"
-        arg=$func_quote_arg_result
-         func_append compile_command " $arg"
diff --git a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch b/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch
deleted file mode 100644
index 8469b8727e..0000000000
--- a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Subject: [PATCH 12/12] libtool.m4: For reproducibility stop encoding hostname in libtool script
-
-For reproducibilty, stop encoding the hostname into the libtool script, this isn't
-really adding much to debugging and most distros are carrying such a patch now as
-reproducibility is important.
-
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/
-        no_hostname.patch
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd826173c4c9c3fa8d77d92785754897cb4bfd89]
-
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index 3794130..84a550c 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -730,7 +730,6 @@ _LT_CONFIG_SAVE_COMMANDS([
-     cat <<_LT_EOF >> "$cfgfile"
- #! $SHELL
- # Generated automatically by $as_me ($PACKAGE) $VERSION
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- 
- # Provide generalized library-building support services.
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/libtool/libtool_2.5.4.bb b/meta/recipes-devtools/libtool/libtool_2.5.4.bb
new file mode 100644
index 0000000000..fa16d09d21
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool_2.5.4.bb
@@ -0,0 +1,17 @@
+require libtool-${PV}.inc
+require remove-buildpaths.inc
+
+RDEPENDS:${PN} += "bash"
+
+#
+# We want the results of libtool-cross preserved - don't stage anything ourselves.
+#
+SYSROOT_DIRS_IGNORE += " \
+    ${bindir} \
+    ${datadir}/aclocal \
+    ${datadir}/libtool/build-aux \
+"
+
+inherit multilib_script
+
+MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool"
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb
index 86c55ded7b..de556a5d81 100644
--- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb
+++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb
@@ -1,21 +1,15 @@
 require libtool-${PV}.inc
+require remove-buildpaths.inc
 
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:"
 
-SRC_URI += "file://fixinstall.patch"
+SRC_URI += "file://0008-libtool-Avoid-relinking-when-cross-compiling-its-poi.patch"
 
 inherit nativesdk
 
-S = "${WORKDIR}/libtool-${PV}"
+S = "${UNPACKDIR}/libtool-${PV}"
 FILES:${PN} += "${datadir}/libtool/*"
 
-do_configure:prepend () {
-        # Remove any existing libtool m4 since old stale versions would break
-        # any upgrade
-        rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
-        rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
-}
-
 do_install () {
         autotools_do_install
         install -d ${D}${bindir}/
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.7.bb b/meta/recipes-devtools/libtool/remove-buildpaths.inc
index 44a4950574..1ca95aeace 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.7.bb
+++ b/meta/recipes-devtools/libtool/remove-buildpaths.inc
@@ -1,20 +1,3 @@
-require libtool-${PV}.inc
-
-SRC_URI += "file://multilib.patch"
-
-RDEPENDS:${PN} += "bash"
-
-#
-# We want the results of libtool-cross preserved - don't stage anything ourselves.
-#
-SYSROOT_DIRS_IGNORE += " \
-    ${bindir} \
-    ${datadir}/aclocal \
-    ${datadir}/libtool/build-aux \
-"
-
-ACLOCALEXTRAPATH:class-target = ""
-
 do_install:append () {
         sed -e 's@--sysroot=${STAGING_DIR_HOST}@@g' \
             -e "s@${DEBUG_PREFIX_MAP}@@g" \
@@ -28,7 +11,3 @@ do_install:append () {
             -e "s@${HOSTTOOLS_DIR}/@@g" \
             -i ${D}${bindir}/libtool
 }
-
-inherit multilib_script
-
-MULTILIB_SCRIPTS = "${PN}:${bindir}/libtool"