[pkgsrc/trunk]: pkgsrc/devel libtool: Unbreak the 2.4.7 update.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31b95680399c
branches:  trunk
changeset: 382694:31b95680399c
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Aug 03 13:06:31 2022 +0000

description:
libtool: Unbreak the 2.4.7 update.

The main issue is that the configure script was generated with a different
version of autoconf compared to upstream, and hardcoded CC='cc -std=gnu11'
which broke inferred tag detection, as well as likely causing other issues
elsewhere.  Generated patches _must_ use the same version as upstream so that
diffs can be reviewed for changes.

While here remove patches for MirBSD and MidnightBSD.  MirBSD was discontinued
many years ago, and support for MidnightBSD was already included upstream.
This significantly simplifies our patches and helps to identify issues.

Bump PKGREVISION of libtool-base and libtool-fortran.

diffstat:

 devel/libtool-base/Makefile                     |      3 +-
 devel/libtool-fortran/Makefile                  |      3 +-
 devel/libtool/distinfo                          |      8 +-
 devel/libtool/patches/manual-libtool.m4         |    183 +-
 devel/libtool/patches/manual-ltdl.m4            |      9 +-
 devel/libtool/patches/manual-ltmain.in          |     72 +-
 devel/libtool/patches/patch-build-aux_ltmain.sh |     73 +-
 devel/libtool/patches/patch-configure           |  15278 +---------------------
 devel/libtool/patches/patch-libltdl_configure   |   9895 +--------------
 9 files changed, 317 insertions(+), 25207 deletions(-)

diffs (truncated from 26743 to 300 lines):

diff -r b6e9a8213746 -r 31b95680399c devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Wed Aug 03 11:51:07 2022 +0000
+++ b/devel/libtool-base/Makefile       Wed Aug 03 13:06:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2022/07/26 16:15:26 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2022/08/03 13:06:32 jperkin Exp $
 
 ###########################################################################
 ###########################################################################
@@ -31,6 +31,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
+PKGREVISION=   1
 
 COMMENT=       Generic shared library support script (the script itself)
 
diff -r b6e9a8213746 -r 31b95680399c devel/libtool-fortran/Makefile
--- a/devel/libtool-fortran/Makefile    Wed Aug 03 11:51:07 2022 +0000
+++ b/devel/libtool-fortran/Makefile    Wed Aug 03 13:06:31 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/07/26 16:15:27 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/08/03 13:06:32 jperkin Exp $
 
 ###########################################################################
 ###########################################################################
@@ -33,6 +33,7 @@
 FILESDIR=      ${.CURDIR}/../libtool-base/files
 
 PKGNAME=       ${DISTNAME:S/-/-fortran-/}
+PKGREVISION=   1
 
 COMMENT=       Generic shared library support script (the script itself, incl. Fortran)
 
diff -r b6e9a8213746 -r 31b95680399c devel/libtool/distinfo
--- a/devel/libtool/distinfo    Wed Aug 03 11:51:07 2022 +0000
+++ b/devel/libtool/distinfo    Wed Aug 03 13:06:31 2022 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.108 2022/07/26 16:15:26 wiz Exp $
+$NetBSD: distinfo,v 1.109 2022/08/03 13:06:31 jperkin Exp $
 
 BLAKE2s (libtool-2.4.7.tar.gz) = ae08c74a0da41b3ae252b207ff642d594648edc9c1af41b0191b899d844fecf7
 SHA512 (libtool-2.4.7.tar.gz) = 27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385
 Size (libtool-2.4.7.tar.gz) = 1938886 bytes
 SHA1 (patch-Makefile.in) = 0adb634335acd5fb280c99b5d43ae568018ca0af
 SHA1 (patch-build-aux_depcomp) = ae6f93ad4fac1df648cfcb62601c72f9ebb30233
-SHA1 (patch-build-aux_ltmain.sh) = 0cf9b87586f9e3e38ea3cc5b145c080b0c7bd940
-SHA1 (patch-configure) = ef16440d8fd726bea7dee71fc0eb04b2e305b6e5
-SHA1 (patch-libltdl_configure) = 05dc719a11c557173d12cd76787f593bd5950e48
+SHA1 (patch-build-aux_ltmain.sh) = 455f1ea72a60e76295d62adb2b2a307df54d9095
+SHA1 (patch-configure) = 22adf967ecbd2e77294d34f5a5f662526a0d3509
+SHA1 (patch-libltdl_configure) = a4ec3706e249e2f0c014513a7be70f0619b0562a
diff -r b6e9a8213746 -r 31b95680399c devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Wed Aug 03 11:51:07 2022 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Wed Aug 03 13:06:31 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: manual-libtool.m4,v 1.49 2022/07/26 16:15:26 wiz Exp $
+$NetBSD: manual-libtool.m4,v 1.50 2022/08/03 13:06:32 jperkin Exp $
 
-Support mirbsd, midnightbsd, minix.
+Support Minix.
 Handle pkgsrc wrappers.
 Fixup output on various OS.
 
@@ -39,16 +39,23 @@
    esac
    if test yes = "$_lt_dar_can_shared"; then
      output_verbose_link_cmd=func_echo_all
-@@ -1569,7 +1575,7 @@ fi
+@@ -1567,12 +1573,9 @@ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+ fi
  
- case $host_os in
-   darwin*)
+-case $host_os in
+-  darwin*)
 -    lock_old_archive_extraction=yes ;;
-+    lock_old_archive_extraction=no ;; # work around bug #14579
-   *)
-     lock_old_archive_extraction=no ;;
- esac
-@@ -1725,7 +1731,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+-  *)
+-    lock_old_archive_extraction=no ;;
+-esac
++# libtool bug#14579
++lock_old_archive_extraction=no
++
+ _LT_DECL([], [old_postinstall_cmds], [2])
+ _LT_DECL([], [old_postuninstall_cmds], [2])
+ _LT_TAGDECL([], [old_archive_cmds], [2],
+@@ -1725,7 +1728,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -57,7 +64,7 @@
      # This has been around since 386BSD, at least.  Likely further.
      if test -x /sbin/sysctl; then
        lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -2675,7 +2681,7 @@ dgux*)
+@@ -2675,7 +2678,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -66,7 +73,7 @@
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -2720,6 +2726,17 @@ freebsd* | dragonfly* | midnightbsd*)
+@@ -2720,6 +2723,17 @@ freebsd* | dragonfly* | midnightbsd*)
    esac
    ;;
  
@@ -84,7 +91,7 @@
  haiku*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -2797,12 +2814,7 @@ interix[[3-9]]*)
+@@ -2797,12 +2811,7 @@ interix[[3-9]]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -98,21 +105,10 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -2907,19 +2919,48 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
+@@ -2907,19 +2916,25 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
-+midnightbsd*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
 +minix*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -125,18 +121,6 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
-+mirbsd*)
-+  version_type=linux
-+  sys_lib_search_path_spec="/usr/lib"
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}${versuffix2} ${libname}${shared_ext}${versuffix2}'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
  netbsd*)
 -  version_type=sunos
 +  version_type=linux
@@ -157,7 +141,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -2945,7 +2986,7 @@ newsos6)
+@@ -2945,7 +2960,7 @@ newsos6)
    ;;
  
  openbsd* | bitrig*)
@@ -166,7 +150,7 @@
    sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-@@ -2953,7 +2994,7 @@ openbsd* | bitrig*)
+@@ -2953,7 +2968,7 @@ openbsd* | bitrig*)
    else
      need_version=yes
    fi
@@ -175,7 +159,7 @@
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
-@@ -3566,12 +3607,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
+@@ -3566,12 +3581,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -185,23 +169,12 @@
 -  else
 -    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
 -  fi
-+midnightbsd*)
-+  # might to use match_pattern like MirBSD, but there is no well-defined
-+  # naming scheme for libraries yet, as the current one is deprecated, and
-+  # the new one in a state of flux especially between mports and MirPorts
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+mirbsd*)
-+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+  ;;
-+
 +netbsd* | minix*)
 +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
    ;;
  
  newos6*)
-@@ -3581,7 +3629,7 @@ newos6*)
+@@ -3581,7 +3592,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -210,7 +183,7 @@
    ;;
  
  openbsd* | bitrig*)
-@@ -3951,7 +3999,7 @@ osf*)
+@@ -3951,7 +3962,7 @@ osf*)
    symcode='[[BCDEGQRST]]'
    ;;
  solaris*)
@@ -219,7 +192,7 @@
    ;;
  sco3.2v5*)
    symcode='[[DT]]'
-@@ -4256,9 +4304,15 @@ m4_if([$1], [CXX], [
+@@ -4256,9 +4267,15 @@ m4_if([$1], [CXX], [
        esac
        ;;
      darwin* | rhapsody*)
@@ -236,7 +209,7 @@
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4337,6 +4391,9 @@ m4_if([$1], [CXX], [
+@@ -4337,6 +4354,9 @@ m4_if([$1], [CXX], [
            ;;
        esac
        ;;
@@ -246,7 +219,7 @@
        freebsd* | dragonfly* | midnightbsd*)
        # FreeBSD uses GNU C++
        ;;
-@@ -4444,7 +4501,7 @@ m4_if([$1], [CXX], [
+@@ -4444,7 +4464,7 @@ m4_if([$1], [CXX], [
            ;;
        esac
        ;;
@@ -255,7 +228,7 @@
        ;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4581,9 +4638,16 @@ m4_if([$1], [CXX], [
+@@ -4581,9 +4601,16 @@ m4_if([$1], [CXX], [
        ;;
  
      darwin* | rhapsody*)
@@ -273,7 +246,7 @@
        ;;
  
      haiku*)
-@@ -4611,6 +4675,13 @@ m4_if([$1], [CXX], [
+@@ -4611,6 +4638,13 @@ m4_if([$1], [CXX], [
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -287,23 +260,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -4789,6 +4860,15 @@ m4_if([$1], [CXX], [
-       esac
-       ;;
- 
-+    mirbsd*)
-+      case $cc_basename in
-+      # pkgsrc f77 is f2c, which uses gcc underneath.
-+      f77*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      ;;
-+      esac
-+      ;;
-+
-     newsos6)
-       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4864,6 +4944,9 @@ m4_if([$1], [CXX], [
+@@ -4864,6 +4898,9 @@ m4_if([$1], [CXX], [
  ])
  case $host_os in
    # For platforms that do not support PIC, -DPIC is meaningless:
@@ -313,7 +270,7 @@
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;