tools: libtool: update to 2.5.4

Update libtool to the current stable 2.5.4 release.

130-trailingslash.patch was upstream, 100 and 110 patches were
manually refreshed while rest was automatically refreshed via quilt.

Link: https://github.com/openwrt/openwrt/pull/18655
Signed-off-by: Robert Marko <[email protected]>

tools/libtool/Makefile

@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
 PKG_CPE_ID:=cpe:/a:gnu:libtool
-PKG_VERSION:=2.4.7
+PKG_VERSION:=2.5.4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8
+PKG_HASH:=da8ebb2ce4dcf46b90098daf962cffa68f4b4f62ea60f798d0ef12929ede6adf
 
 HOST_BUILD_PARALLEL:=1
 

tools/libtool/patches/000-relocatable.patch

@@ -40,7 +40,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  
  ## -------------------------- ##
  ## Source external libraries. ##
-@@ -1903,11 +1912,21 @@ func_require_seen_libtool ()
+@@ -1934,11 +1943,21 @@ func_require_seen_libtool ()
    pkgmacro_files="@pkgmacro_files@"
  
    # Locations for important files:
@@ -69,7 +69,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
    if test -n "$_lt_pkgdatadir"; then
 --- a/m4/libtool.m4
 +++ b/m4/libtool.m4
-@@ -933,7 +933,7 @@ m4_defun([_LT_TAG_COMPILER],
+@@ -932,7 +932,7 @@ m4_defun([_LT_TAG_COMPILER],
  [AC_REQUIRE([AC_PROG_CC])dnl
  
  _LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
@@ -78,7 +78,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
  _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
  
-@@ -8183,9 +8183,9 @@ m4_defun([_LT_DECL_EGREP],
+@@ -8338,9 +8338,9 @@ m4_defun([_LT_DECL_EGREP],
  [AC_REQUIRE([AC_PROG_EGREP])dnl
  AC_REQUIRE([AC_PROG_FGREP])dnl
  test -z "$GREP" && GREP=grep
@@ -91,7 +91,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
  AC_SUBST([GREP])
  ])
-@@ -8226,9 +8226,8 @@ _LT_DECL([], [FILECMD], [1], [A file(cmd
+@@ -8381,9 +8381,8 @@ _LT_DECL([], [FILECMD], [1], [A file(cmd
  # as few characters as possible.  Prefer GNU sed if found.
  m4_defun([_LT_DECL_SED],
  [AC_PROG_SED

tools/libtool/patches/100-libdir-fixes.patch

@@ -19,7 +19,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
 
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -6097,8 +6097,14 @@ func_mode_link ()
+@@ -6274,8 +6274,14 @@ func_mode_link ()
  	    absdir=$abs_ladir
  	    libdir=$abs_ladir
  	  else
@@ -36,16 +36,16 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  	  fi
  	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
  	else
-@@ -6496,8 +6502,6 @@ func_mode_link ()
+@@ -6682,8 +6688,6 @@ func_mode_link ()
  		add=$libdir/$linklib
  	      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
-@@ -6652,7 +6656,17 @@ func_mode_link ()
+@@ -6836,7 +6840,17 @@ func_mode_link ()
  		  fi
  		  ;;
  		*)

tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch

@@ -10,7 +10,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
 
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -6482,13 +6482,13 @@ func_mode_link ()
+@@ -6668,13 +6668,13 @@ func_mode_link ()
  	    add_dir=
  	    add=
  	    # Finalize command for both is simple: just hardcode it.
@@ -22,7 +22,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
 +	       test "$hardcode_direct_absolute" = no; then
 +	      add="$libdir/$linklib"
 +	    elif test "$hardcode_minus_L" = yes; then
- 	      add_dir=-L$libdir
+ 	      add_dir=-L$lt_sysroot$libdir
 -	      add=-l$name
 -	    elif test yes = "$hardcode_shlibpath_var"; then
 +	      add="-l$name"

tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch

@@ -13,7 +13,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
 
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -2400,6 +2400,9 @@ func_mode_install ()
+@@ -2540,6 +2540,9 @@ func_mode_install ()
  	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
  	  fi
  

tools/libtool/patches/130-trailingslash.patch

@@ -1,37 +0,0 @@
-From 1b45c3c0d6682be7f4876b620780ee246a5acbaa Mon Sep 17 00:00:00 2001
-From: Eneas U de Queiroz <[email protected]>
-Date: Tue, 20 Jul 2021 16:56:16 -0300
-Subject: openwrt: remove trailing slash in install destdir
-
-A command like /bin/sh ../../i586-poky-linux-libtool   --mode=install /usr/bin/install -c   gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio)
-
-This is because libdir has a trailing slash which breaks the comparision.
-
-RP 2/1/10
-
-Merged a patch received from Gary Thomas <[email protected]>
-
-Date: 2010/07/12
-Nitin A Kamble <[email protected]>
-
-Signed-off-by: Eneas U de Queiroz <[email protected]>
-
---- a/build-aux/ltmain.in
-+++ b/build-aux/ltmain.in
-@@ -2381,8 +2381,15 @@ 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

tools/libtool/patches/140-don-t-quote-SHELL-in-Makefile.am.patch

@@ -9,7 +9,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
 
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -46,7 +46,7 @@ EXTRA_LTLIBRARIES	=
+@@ -43,7 +43,7 @@ EXTRA_LTLIBRARIES	=
  # Using 'cd' in backquotes may print the directory name, use this instead:
  lt__cd		= CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  
@@ -18,7 +18,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  rebuild = rebuild=:; revision=`$(lt__cd) $(srcdir) && $(git_version_gen) | $(SED) 's|-.*$$||'`
  
  
-@@ -306,7 +306,7 @@ libtool: $(ltmain_sh) $(config_status) $
+@@ -303,7 +303,7 @@ libtool: $(ltmain_sh) $(config_status) $
  	  if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \
  	    then echo "  GEN     " $@; \
  	  else echo '$(SHELL) $(top_builddir)/config.status "$@"'; fi; \
@@ -27,7 +27,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  	fi
  
  
-@@ -789,13 +789,13 @@ testsuite_deps_uninstalled = $(testsuite
+@@ -790,13 +790,13 @@ testsuite_deps_uninstalled = $(testsuite
  # Hook the test suite into the check rule
  check-local: $(testsuite_deps_uninstalled)
  	$(AM_V_at)$(CD_TESTDIR); \
@@ -43,7 +43,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  	  $(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) \
  	  AUTOTEST_PATH='$(exec_prefix)/bin'
  
-@@ -807,7 +807,7 @@ check-noninteractive-old:
+@@ -808,7 +808,7 @@ check-noninteractive-old:
  .PHONY: check-noninteractive-new
  check-noninteractive-new: $(testsuite_deps_uninstalled)
  	$(AM_V_at)$(CD_TESTDIR); \
@@ -52,7 +52,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  	  $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) \
  	  -k '!interactive' INNER_TESTSUITEFLAGS=',!interactive' \
  	  $(TESTSUITEFLAGS)
-@@ -816,7 +816,7 @@ check-noninteractive-new: $(testsuite_de
+@@ -817,7 +817,7 @@ check-noninteractive-new: $(testsuite_de
  .PHONY: check-interactive
  check-interactive: $(testsuite_deps_uninstalled)
  	$(AM_V_at)$(CD_TESTDIR); \
@@ -61,7 +61,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
  	  $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) \
  	  -k interactive -k recursive INNER_TESTSUITEFLAGS=',interactive' \
  	  $(TESTSUITEFLAGS)
-@@ -828,7 +828,7 @@ check-noninteractive: check-noninteracti
+@@ -829,7 +829,7 @@ check-noninteractive: check-noninteracti
  clean-local:
  	-$(CD_TESTDIR); \
  	test -f "$$abs_srcdir/$(TESTSUITE)" && \

tools/libtool/patches/200-openwrt-branding.patch

@@ -12,7 +12,7 @@ Signed-off-by: Eneas U de Queiroz <[email protected]>
 
 --- a/build-aux/ltmain.in
 +++ b/build-aux/ltmain.in
-@@ -82,7 +82,7 @@ func_echo ()
+@@ -105,7 +105,7 @@ func_echo ()
      IFS=$nl
      for _G_line in $_G_message; do
        IFS=$func_echo_IFS