[pkgsrc/trunk]: pkgsrc/devel Update to 1.5.14, and switch DragonFly to versio...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel Update to 1.5.14, and switch DragonFly to versio...
From: tv <tv%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:32:55 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/06e7ac2b8aec
branches:  trunk
changeset: 491198:06e7ac2b8aec
user:      tv <tv%pkgsrc.org@localhost>
date:      Tue Mar 22 15:12:07 2005 +0000

description:
Update to 1.5.14, and switch DragonFly to version_type=linux.
Change summary since 1.5.10:

        * ltmain.in: Add -pthread like flags when linking executables too.

        * ltmain.in (func_extract_archives) [darwin]: This didn't actually
        work on a real fat archive, should do now.

        * tests/func_extract_archives.test: remove darwin fat tests which
        did not actually work.

        * ltmain.in (link mode): Allow five digits in version-info

        * ltmain.in (link mode): With piecewise (partial) linking, fix
        intermediate output name for subdir-objects.

        * ltmain.in [darwin]: Don't add installed libs to temp_rpath when
        building executables on darwin, or other systems which use
        hardcode_automatic. It may break our wrapper scripts.

        * ltmain.in [darwin]: Allow -framework foo through when given on
        the command line.

        * ltmain.in [irix]: Preserve processor option for SGI Compiler
        (-r[0-9][0-9]*).

        * ltmain.in: Don't pass through compiler-like thread flags when
        using $LD to do the linking. Use compiler_flags instead.
        Reported by Mark_Andrews%isc.org@localhost.

        * libtool.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: While "parsing"
        /etc/ld.so.conf, skip comments.

        * ltmain.in (func_extract_archives): Not all shells grok
        `read -r' (unnecessary in this case).
        Reported by Ralf Menzel <menzel%ls6.cs.uni-dortmund.de@localhost>.

        * libtool.m4 [solaris] (AC_LIBTOOL_PROG_LD_SHLIBS): Use ${wl} for
        whole_archive_flag_spec.  Missing backport reported by Ralf Menzel

        * libtool.m4 [linux] (AC_LIBTOOL_PROG_COMPILER_PIC): match
        $cc_basename, not $CC against icc.  Also, for symmetry match
        icpc* and ecpc* (ia64 version of icpc).

        * m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER) [linux]: Interpret
        `include' statements in toplevel ld.so.conf file.

        * config/ltmain.in (func_mode_link): When linking an installed
        libtool library on the command line using -lfoo we need to find
        the library in the search paths and add it's dependency_libs to
        the link in the conv pass so that any libtool libs listed are
        correctly expanded in the link pass.

diffstat:

 devel/libtool-base/Makefile             |    3 +-
 devel/libtool/Makefile.common           |    4 +-
 devel/libtool/distinfo                  |   14 +-
 devel/libtool/patches/manual-libtool.m4 |  135 ++++------------
 devel/libtool/patches/manual-ltdl.m4    |    6 +-
 devel/libtool/patches/manual.README     |    6 +-
 devel/libtool/patches/patch-ab          |  258 +++++++------------------------
 devel/libtool/patches/patch-ac          |   79 +++------
 devel/libtool/patches/patch-ad          |  258 +++++++------------------------
 9 files changed, 192 insertions(+), 571 deletions(-)

diffs (truncated from 1717 to 300 lines):

diff -r a25c6d16a130 -r 06e7ac2b8aec devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Tue Mar 22 15:11:20 2005 +0000
+++ b/devel/libtool-base/Makefile       Tue Mar 22 15:12:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/03/18 15:06:10 tv Exp $
+# $NetBSD: Makefile,v 1.60 2005/03/22 15:12:08 tv Exp $
 #
 
 .include "../../devel/libtool/Makefile.common"
@@ -12,7 +12,6 @@
 # on the next libtool update.
 #
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   10
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
diff -r a25c6d16a130 -r 06e7ac2b8aec devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common     Tue Mar 22 15:11:20 2005 +0000
+++ b/devel/libtool/Makefile.common     Tue Mar 22 15:12:07 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.59 2005/01/19 16:33:55 tv Exp $
+# $NetBSD: Makefile.common,v 1.60 2005/03/22 15:12:07 tv Exp $
 #
 
-DISTNAME=      libtool-1.5.10
+DISTNAME=      libtool-1.5.14
 CATEGORIES=    devel pkgtools
 MASTER_SITES=  ${MASTER_SITE_GNU:=libtool/}
 
diff -r a25c6d16a130 -r 06e7ac2b8aec devel/libtool/distinfo
--- a/devel/libtool/distinfo    Tue Mar 22 15:11:20 2005 +0000
+++ b/devel/libtool/distinfo    Tue Mar 22 15:12:07 2005 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.56 2005/02/23 22:24:20 agc Exp $
+$NetBSD: distinfo,v 1.57 2005/03/22 15:12:07 tv Exp $
 
-SHA1 (libtool-1.5.10.tar.gz) = bb2cab7f405c5eb08ab8ba193cbac59ebe6e6e9e
-RMD160 (libtool-1.5.10.tar.gz) = de782f5ff25e73e0a548a1b8271ba6b69ac7a751
-Size (libtool-1.5.10.tar.gz) = 2699923 bytes
+SHA1 (libtool-1.5.14.tar.gz) = 0c8935aa80cd5532aa8e5462157cc07ae26a3862
+RMD160 (libtool-1.5.14.tar.gz) = f26606366a76a5703929ed1785f745f69bceb8c6
+Size (libtool-1.5.14.tar.gz) = 2732031 bytes
 SHA1 (patch-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
-SHA1 (patch-ab) = a41b9ba60018759bd875ace18ac01b39bcfecd24
-SHA1 (patch-ac) = c1951ce25a285aee75a2984ee45db2f2e99dac4d
-SHA1 (patch-ad) = 4007775711ba48b57abb3965f25335080da27750
+SHA1 (patch-ab) = df27e4db60447ccad850dcc3318ffee33f60ad23
+SHA1 (patch-ac) = f98adcd50cc5a62e60a0514d5cac90bebf179157
+SHA1 (patch-ad) = d0aa264da58272e34bfda137875309abf3db37a4
diff -r a25c6d16a130 -r 06e7ac2b8aec devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Tue Mar 22 15:11:20 2005 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Tue Mar 22 15:12:07 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: manual-libtool.m4,v 1.12 2005/01/18 18:51:15 tv Exp $
+$NetBSD: manual-libtool.m4,v 1.13 2005/03/22 15:12:08 tv Exp $
 
---- libtool.m4.orig    2004-09-19 08:15:08.000000000 -0400
+--- libtool.m4.orig    2005-02-12 07:18:34.000000000 -0500
 +++ libtool.m4
-@@ -361,11 +361,11 @@ else
+@@ -346,11 +346,11 @@ else
  
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
@@ -16,16 +16,7 @@
      elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
         test "X$CONFIG_SHELL" != X/bin/ksh; then
        # If we have ksh, try running configure again with it.
-@@ -678,7 +678,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
--  netbsd* | freebsd* | openbsd* | darwin* )
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-     # 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`
-@@ -1201,6 +1201,7 @@ beos*)
+@@ -1198,6 +1198,7 @@ beos*)
  bsdi[[45]]*)
    version_type=linux
    need_version=no
@@ -33,16 +24,15 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -1315,16 +1316,17 @@ kfreebsd*-gnu)
-   ;;
- 
- freebsd*)
-+  version_type=linux
+@@ -1315,15 +1316,16 @@ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  version_type=linux
 +  case $objformat in
 +    elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -52,29 +42,12 @@
        ;;
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+    *)
++    *)  
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix2'
        need_version=yes
        ;;
    esac
-@@ -1344,6 +1346,16 @@ freebsd*)
-   esac
-   ;;
- 
-+dragonfly*)
-+  version_type=freebsd-elf # XXX tv this should be =linux; current selection has problems
-+  need_version=no
-+  need_lib_prefix=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
- gnu*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -1400,15 +1412,22 @@ hpux9* | hpux10* | hpux11*)
+@@ -1399,15 +1401,22 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -103,7 +76,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -1485,11 +1504,11 @@ knetbsd*-gnu)
+@@ -1484,11 +1493,11 @@ knetbsd*-gnu)
    ;;
  
  netbsd*)
@@ -117,7 +90,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
-@@ -1520,10 +1539,10 @@ nto-qnx*)
+@@ -1519,10 +1528,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -130,34 +103,18 @@
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-@@ -1688,9 +1707,7 @@ if test -f "$ltmain" && test -n "$tagnam
+@@ -1687,9 +1696,7 @@ if test -f "$ltmain" && test -n "$tagnam
  
        case $tagname in
        CXX)
 -      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--          ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
+-          ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -          (test "X$CXX" != "Xg++"))) ; then
-+      if test -n "$CXX" && test "X$CXX" != "Xno"; then
++        if test -n "$CXX" && test "X$CXX" != "Xno"; then
          AC_LIBTOOL_LANG_CXX_CONFIG
        else
          tagname=""
-@@ -2160,13 +2177,13 @@ darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu)
-+freebsd* | kfreebsd*-gnu | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -2198,6 +2215,10 @@ hpux10.20* | hpux11*)
+@@ -2197,6 +2204,10 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -168,7 +125,7 @@
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -2425,21 +2446,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
+@@ -2424,22 +2435,10 @@ AC_DEFUN([AC_LIBTOOL_CXX],
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -183,15 +140,16 @@
 -[
 -AC_REQUIRE([AC_PROG_CXX])
 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
+-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -    (test "X$CXX" != "Xg++"))) ; then
 -  AC_PROG_CXXCPP
 -fi
 -])# _LT_AC_PROG_CXXCPP
- 
+-
  # AC_LIBTOOL_F77
  # --------------
-@@ -2604,7 +2614,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
+ # enable support for Fortran 77 libraries
+@@ -2603,7 +2602,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -200,7 +158,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -2933,7 +2943,7 @@ case $host_os in
+@@ -2935,7 +2934,7 @@ case $host_os in
            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` 
$verstring'
            _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
@@ -209,16 +167,7 @@
            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o 
$lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -2967,7 +2977,7 @@ case $host_os in
-   freebsd-elf*)
-     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-     ;;
--  freebsd* | kfreebsd*-gnu)
-+  freebsd* | kfreebsd*-gnu | dragonfly*)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -3091,6 +3101,16 @@ case $host_os in
+@@ -3093,6 +3092,16 @@ case $host_os in
        ;;
      esac
      ;;
@@ -235,7 +184,7 @@
    irix5* | irix6*)
      case $cc_basename in
        CC)
-@@ -3208,14 +3228,29 @@ case $host_os in
+@@ -3222,14 +3231,29 @@ case $host_os in
      ;;
    netbsd*)
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -267,7 +216,7 @@
      ;;
    openbsd2*)
      # C++ shared libraries are fairly broken
-@@ -3651,6 +3686,21 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -3665,6 +3689,21 @@ if AC_TRY_EVAL(ac_compile); then
      esac
    done
  
@@ -289,7 +238,7 @@
    # Clean up.
    rm -f a.out a.exe
  else
-@@ -4591,9 +4641,11 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4611,9 +4650,11 @@ AC_MSG_CHECKING([for $compiler option to
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
@@ -302,7 +251,7 @@
        ;;
      *djgpp*)
        # DJGPP does not support shared libraries at all
-@@ -4615,6 +4667,10 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4635,6 +4676,10 @@ AC_MSG_CHECKING([for $compiler option to
        ;;
        esac
        ;;
@@ -313,16 +262,7 @@
      *)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
-@@ -4661,7 +4717,7 @@ AC_MSG_CHECKING([for $compiler option to
-           ;;
-       esac
-       ;;
--      freebsd* | kfreebsd*-gnu)
-+      freebsd* | kfreebsd*-gnu | dragonfly*)
-       # FreeBSD uses GNU C++
-       ;;
-       hpux9* | hpux10* | hpux11*)
-@@ -4689,6 +4745,8 @@ AC_MSG_CHECKING([for $compiler option to
+@@ -4709,6 +4754,8 @@ AC_MSG_CHECKING([for $compiler option to
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated fontforge to 20050310
Next by Date: [pkgsrc/trunk]: pkgsrc/doc -libtool, libtool-base, libtool-info (thanks, tv).
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated fontforge to 20050310
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc -libtool, libtool-base, libtool-info (thanks, tv).
Indexes:
Home | Main Index | Thread Index | Old Index