ports/libtool: Upgrade to 2.5.4

patches/libtool/jinx-working-patch.patch

@@ -1,16 +1,3 @@
-diff --git libtool-clean/build-aux/ltmain.in libtool-workdir/build-aux/ltmain.in
-index a5f21a1..c06d55c 100644
---- libtool-clean/build-aux/ltmain.in
-+++ libtool-workdir/build-aux/ltmain.in
-@@ -6497,7 +6497,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
 diff --git libtool-clean/libtoolize.in libtool-workdir/libtoolize.in
 index 0c40fed..763619b 100644
 --- libtool-clean/libtoolize.in
@@ -32,107 +19,8 @@ index 79a2451..db95342 100644
      lt_cv_sys_max_cmd_len=12288;    # 12K is about right
      ;;
 
--  gnu*)
-+  gnu* | vinix*)
-     # Under GNU Hurd, this test is not required because there is
-     # no limit to the length of command line arguments.
+-  gnu* | ironclad*)
++  gnu* | ironclad* | vinix*)
+     # Under GNU Hurd and Ironclad, this test is not required because there
+     # is no limit to the length of command line arguments.
      # Libtool will interpret -1 as no limit whatsoever
-@@ -2925,6 +2925,18 @@ netbsd*)
-   hardcode_into_libs=yes
-   ;;
-
-+*-mlibc)
-+  version_type=linux # correct to gnu/linux during the next big refactor
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-+  soname_spec='$libname$release$shared_ext$major'
-+  dynamic_linker='mlibc ld.so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- newsos6)
-   version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
-@@ -3566,6 +3578,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
-
-+*-mlibc)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
- netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-@@ -4446,6 +4462,8 @@ m4_if([$1], [CXX], [
- 	;;
-       netbsd*)
- 	;;
-+      *-mlibc)
-+	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-         # it will coredump.
-@@ -4794,6 +4812,12 @@ m4_if([$1], [CXX], [
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-       ;;
-
-+    *-mlibc)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+      ;;
-+
-     *nto* | *qnx*)
-       # QNX uses GNU C++, but need to define -shared option too, otherwise
-       # it will coredump.
-@@ -5273,6 +5297,11 @@ _LT_EOF
-       fi
-       ;;
-
-+    *-mlibc)
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
-+      ;;
-+
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -5815,6 +5844,9 @@ _LT_EOF
-       esac
-       ;;
-
-+    *-mlibc)
-+      ;;
-+
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-@@ -7115,6 +7147,10 @@ if test yes != "$_lt_caught_CXX_error"; then
- 	esac
- 	;;
-
-+      *-mlibc)
-+	    _LT_TAGVAR(ld_shlibs, $1)=yes
-+	    ;;
-+
-       netbsd*)
-         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-diff --git libtool-clean/m4/ltdl.m4 libtool-workdir/m4/ltdl.m4
-index 772c150..0ca254d 100644
---- libtool-clean/m4/ltdl.m4
-+++ libtool-workdir/m4/ltdl.m4
-@@ -481,6 +481,9 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
-     # GNU and its variants, using gnu ld.so (Glibc)
-     lt_cv_sys_dlopen_deplibs=yes
-     ;;
-+  *-mlibc)
-+    lt_cv_sys_dlopen_deplibs=yes
-+    ;;
-   hpux10*|hpux11*)
-     lt_cv_sys_dlopen_deplibs=yes
-     ;;

source-recipes/libtool

@@ -1,15 +1,15 @@
 #! /bin/sh
 
 name=libtool
-version=2.5.0
-tarball_url="https://alpha.gnu.org/gnu/libtool/libtool-${version}.tar.gz"
-tarball_blake2b="83494eac1b4c6313bbf58098e4b5f8512022f9730b78dd61736c55783fb4e5444eb1f8aaf13ce259fe7e13225e6fa563440ad74856bde20bde7021e7e3378e3d"
+version=2.5.4
+tarball_url="https://ftp.gnu.org/gnu/libtool/libtool-${version}.tar.xz"
+tarball_blake2b="47de3c49a690d44d7ddd5e3b5e4090c91dc5fbb9c40fc4a3963e150fb7329326ee3e21b8c149974726171c4b0380028e0efc7a369c4f04357eea46f69852e1cc"
 hostdeps="autoconf automake"
 imagedeps="help2man git"
 allow_network="yes"
 
 prepare() {
     git clone https://git.savannah.gnu.org/git/gnulib.git
-    git -C gnulib checkout c6942e47da903adc68b887cbedfac07b099088f2
+    git -C gnulib checkout ea58a72d4db3c4729e51de2633845ee381dd00b6
     ./bootstrap --force --skip-git --skip-po --gnulib-srcdir=`pwd`/gnulib
 }