[pkgsrc/trunk]: pkgsrc/devel Add support for Minix which follows the NetBSD c...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel Add support for Minix which follows the NetBSD c...
From: sevan <sevan%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 10:11:09 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ed5460aa617
branches:  trunk
changeset: 387291:6ed5460aa617
user:      sevan <sevan%pkgsrc.org@localhost>
date:      Tue Nov 13 21:44:42 2018 +0000

description:
Add support for Minix which follows the NetBSD configuration. Tested on 3.4RC6.

diffstat:

 devel/libtool-base/Makefile                     |    4 +-
 devel/libtool/distinfo                          |    8 +-
 devel/libtool/patches/manual-libtool.m4         |  117 +++++++----
 devel/libtool/patches/manual-ltdl.m4            |   12 +-
 devel/libtool/patches/patch-build-aux_ltmain.sh |    4 +-
 devel/libtool/patches/patch-configure           |  236 +++++++++++++++--------
 devel/libtool/patches/patch-libltdl_configure   |   49 +++-
 7 files changed, 269 insertions(+), 161 deletions(-)

diffs (truncated from 1374 to 300 lines):

diff -r 190c7b3fe91c -r 6ed5460aa617 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Tue Nov 13 21:08:34 2018 +0000
+++ b/devel/libtool-base/Makefile       Tue Nov 13 21:44:42 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2018/03/12 16:36:44 hans Exp $
+# $NetBSD: Makefile,v 1.120 2018/11/13 21:44:42 sevan Exp $
 
 ###########################################################################
 ###########################################################################
@@ -31,7 +31,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Generic shared library support script (the script itself)
 
diff -r 190c7b3fe91c -r 6ed5460aa617 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Tue Nov 13 21:08:34 2018 +0000
+++ b/devel/libtool/distinfo    Tue Nov 13 21:44:42 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.104 2018/03/12 16:36:44 hans Exp $
+$NetBSD: distinfo,v 1.105 2018/11/13 21:44:42 sevan Exp $
 
 SHA1 (libtool-2.4.6.tar.gz) = 25b6931265230a06f0fc2146df64c04e5ae6ec33
 RMD160 (libtool-2.4.6.tar.gz) = 6f4b4c3e89426652da3acffa707f71bb4ccee26a
@@ -6,6 +6,6 @@
 Size (libtool-2.4.6.tar.gz) = 1806697 bytes
 SHA1 (patch-Makefile.in) = 0adb634335acd5fb280c99b5d43ae568018ca0af
 SHA1 (patch-build-aux_depcomp) = ae6f93ad4fac1df648cfcb62601c72f9ebb30233
-SHA1 (patch-build-aux_ltmain.sh) = eebdc102cacb1970240abeb4a7310d09d505be02
-SHA1 (patch-configure) = 2cbf275a4de712bc151c5065b62b2bdb37c83188
-SHA1 (patch-libltdl_configure) = 87535836200547ceb8463a98e86561c2adf1f0ed
+SHA1 (patch-build-aux_ltmain.sh) = 110c3976ccdc2a69c34001923427e47e9c4b3b37
+SHA1 (patch-configure) = 30b05f8f258b3e16abf7daadb9d59cce9dbd9976
+SHA1 (patch-libltdl_configure) = 73cc33d5ce0a91c7cd976d4a386e17d69d377c24
diff -r 190c7b3fe91c -r 6ed5460aa617 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Tue Nov 13 21:08:34 2018 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Tue Nov 13 21:44:42 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: manual-libtool.m4,v 1.47 2018/03/12 16:36:44 hans Exp $
+$NetBSD: manual-libtool.m4,v 1.48 2018/11/13 21:44:42 sevan Exp $
 
-Support mirbsd/midnightbsd.
+Support mirbsd, midnightbsd, minix.
 Handle pkgsrc wrappers.
 Fixup output on various OS.
 
---- m4/libtool.m4.orig 2015-01-20 16:15:19.000000000 +0000
+--- m4/libtool.m4.orig Tue Jan 20 16:15:19 2015
 +++ m4/libtool.m4
 @@ -117,7 +117,10 @@ func_cc_basename ()
          *) break;;
@@ -48,12 +48,12 @@
    *)
      lock_old_archive_extraction=no ;;
  esac
-@@ -1714,7 +1720,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+@@ -1714,7 +1720,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
 -  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
-+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd* | mirbsd*)
++  bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd* | mirbsd*)
      # 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`
@@ -98,7 +98,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -2887,19 +2899,36 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
+@@ -2887,19 +2899,48 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -113,6 +113,18 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
++minix*)
++  version_type=linux
++  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='Minix ld.elf_so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
 +mirbsd*)
 +  version_type=linux
 +  sys_lib_search_path_spec="/usr/lib"
@@ -145,7 +157,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -2925,7 +2954,7 @@ newsos6)
+@@ -2925,7 +2966,7 @@ newsos6)
    ;;
  
  openbsd* | bitrig*)
@@ -154,7 +166,7 @@
    sys_lib_dlsearch_path_spec=/usr/lib
    need_lib_prefix=no
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
-@@ -2933,7 +2962,7 @@ openbsd* | bitrig*)
+@@ -2933,7 +2974,7 @@ openbsd* | bitrig*)
    else
      need_version=yes
    fi
@@ -163,32 +175,35 @@
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
-@@ -3546,12 +3575,19 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
+@@ -3546,14 +3587,21 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
    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)$'
+-  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*)
--  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)$'
--  else
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
--  fi
++netbsd* | minix*)
 +  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-   ;;
- 
++  ;;
++
  newos6*)
-@@ -3561,7 +3597,7 @@ newos6*)
+   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+   lt_cv_file_magic_cmd=/usr/bin/file
+@@ -3561,7 +3609,7 @@ newos6*)
    ;;
  
  *nto* | *qnx*)
@@ -197,7 +212,7 @@
    ;;
  
  openbsd* | bitrig*)
-@@ -3931,7 +3967,7 @@ osf*)
+@@ -3931,7 +3979,7 @@ osf*)
    symcode='[[BCDEGQRST]]'
    ;;
  solaris*)
@@ -206,7 +221,7 @@
    ;;
  sco3.2v5*)
    symcode='[[DT]]'
-@@ -4236,9 +4272,15 @@ m4_if([$1], [CXX], [
+@@ -4236,10 +4284,16 @@ m4_if([$1], [CXX], [
        esac
        ;;
      darwin* | rhapsody*)
@@ -216,14 +231,15 @@
        # Common symbols not allowed in MH_DYLIB files
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=''
-+      ;;
+       ;;
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-       ;;
++      ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4317,6 +4359,9 @@ m4_if([$1], [CXX], [
+       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4317,6 +4371,9 @@ m4_if([$1], [CXX], [
            ;;
        esac
        ;;
@@ -233,7 +249,16 @@
        freebsd* | dragonfly*)
        # FreeBSD uses GNU C++
        ;;
-@@ -4561,9 +4606,16 @@ m4_if([$1], [CXX], [
+@@ -4424,7 +4481,7 @@ m4_if([$1], [CXX], [
+           ;;
+       esac
+       ;;
+-      netbsd*)
++      netbsd* | minix*)
+       ;;
+       *qnx* | *nto*)
+         # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -4561,11 +4618,18 @@ m4_if([$1], [CXX], [
        ;;
  
      darwin* | rhapsody*)
@@ -243,15 +268,17 @@
        # Common symbols not allowed in MH_DYLIB files
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=''
-+      ;;
-+
+       ;;
+ 
 +    *mint*)
 +      # FreeMiNT does not support shared libraries at all
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-       ;;
- 
++      ;;
++
      haiku*)
-@@ -4591,6 +4643,13 @@ m4_if([$1], [CXX], [
+       # PIC is the default for Haiku.
+       # The "-static" flag exists, but is broken.
+@@ -4591,6 +4655,13 @@ m4_if([$1], [CXX], [
        # Instead, we relocate shared libraries at runtime.
        ;;
  
@@ -265,7 +292,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -4769,6 +4828,15 @@ m4_if([$1], [CXX], [
+@@ -4769,6 +4840,15 @@ m4_if([$1], [CXX], [
        esac
        ;;
  
@@ -281,7 +308,7 @@
      newsos6)
        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -4844,6 +4912,9 @@ m4_if([$1], [CXX], [
+@@ -4844,6 +4924,9 @@ m4_if([$1], [CXX], [
  ])
  case $host_os in
    # For platforms that do not support PIC, -DPIC is meaningless:
@@ -291,7 +318,7 @@
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -5252,16 +5323,29 @@ _LT_EOF
+@@ -5252,16 +5335,29 @@ _LT_EOF
        fi
        ;;
  
@@ -315,7 +342,7 @@
        fi
        ;;
  
-+    netbsd*)
++    netbsd* | minix*)
 +      _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'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -327,7 +354,7 @@
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
        _LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5794,15 +5878,28 @@ _LT_EOF
+@@ -5794,15 +5890,28 @@ _LT_EOF
        esac
        ;;
  
@@ -351,7 +378,7 @@
 -      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      ;;
 +
-+    netbsd*)
++    netbsd* | minix*)
 +      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -361,7 +388,7 @@
        ;;
  
      newsos6)
-@@ -5814,6 +5911,11 @@ _LT_EOF
Prev by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/bootstrap-mk-files/files/mods Minix does supp...
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/py-openpyxl py-openpyxl: updated to 2.5.10
Previous by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/bootstrap-mk-files/files/mods Minix does supp...
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/py-openpyxl py-openpyxl: updated to 2.5.10
Indexes:
Home | Main Index | Thread Index | Old Index