[pkgsrc/trunk]: pkgsrc/devel Don't try to extract GCC's linker line. It inclu...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel Don't try to extract GCC's linker line. It inclu...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 15:31:44 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9645adaed853
branches:  trunk
changeset: 631507:9645adaed853
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Mar 08 19:57:25 2014 +0000

description:
Don't try to extract GCC's linker line. It includes -lgcc, but not
-lgcc_s for starters. It also confuses the static-only library search in
libtool itself. Bump revision.

Based on patch from jperkin@.

diffstat:

 devel/libtool-base/Makefile             |    4 +-
 devel/libtool/distinfo                  |    6 +-
 devel/libtool/patches/manual-libtool.m4 |   25 ++-
 devel/libtool/patches/manual.README     |    4 +-
 devel/libtool/patches/patch-ab          |  185 +++++++++++++++++--------------
 devel/libtool/patches/patch-ad          |   48 ++++++--
 6 files changed, 160 insertions(+), 112 deletions(-)

diffs (truncated from 1078 to 300 lines):

diff -r 5005376a4bfb -r 9645adaed853 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Sat Mar 08 13:08:50 2014 +0000
+++ b/devel/libtool-base/Makefile       Sat Mar 08 19:57:25 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2014/02/26 10:40:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.106 2014/03/08 19:57:26 joerg Exp $
 
 ###########################################################################
 ###########################################################################
@@ -26,7 +26,7 @@
 .include "../../devel/libtool/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-base-/}
-PKGREVISION=   5
+PKGREVISION=   6
 SVR4_PKGNAME=  ltoob
 
 COMMENT=       Generic shared library support script (the script itself)
diff -r 5005376a4bfb -r 9645adaed853 devel/libtool/distinfo
--- a/devel/libtool/distinfo    Sat Mar 08 13:08:50 2014 +0000
+++ b/devel/libtool/distinfo    Sat Mar 08 19:57:25 2014 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.89 2013/08/27 15:50:23 joerg Exp $
+$NetBSD: distinfo,v 1.90 2014/03/08 19:57:25 joerg Exp $
 
 SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
 RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
 Size (libtool-2.4.2.tar.gz) = 2632347 bytes
 SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
-SHA1 (patch-ab) = 621798a0b1ed5b63f90d5cdca9c0287795a3d27c
+SHA1 (patch-ab) = cf6e8852b6c9eb04256904085f4ee6fefc470a02
 SHA1 (patch-ac) = 108989e3f1ee199fa8e8a9dc7331d360c586a800
-SHA1 (patch-ad) = a9471bff3c9f7e87120f78c1461835e6cbc60931
+SHA1 (patch-ad) = 48c3832e9205777832ef2a6334033ff6099be8a4
diff -r 5005376a4bfb -r 9645adaed853 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4   Sat Mar 08 13:08:50 2014 +0000
+++ b/devel/libtool/patches/manual-libtool.m4   Sat Mar 08 19:57:25 2014 +0000
@@ -1,7 +1,9 @@
-$NetBSD: manual-libtool.m4,v 1.37 2013/08/27 15:50:23 joerg Exp $
+$NetBSD: manual-libtool.m4,v 1.38 2014/03/08 19:57:25 joerg Exp $
 
 --- libltdl/m4/libtool.m4.orig 2011-10-17 10:17:05.000000000 +0000
 +++ libltdl/m4/libtool.m4
+--- libtool.m4.orig    2011-10-17 10:17:05.000000000 +0000
++++ libtool.m4
 @@ -123,7 +123,10 @@ m4_defun([_LT_CC_BASENAME],
      *) break;;
    esac
@@ -283,7 +285,7 @@
    *djgpp*)
      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
      ;;
-@@ -4861,16 +4929,28 @@ _LT_EOF
+@@ -4861,16 +4929,29 @@ _LT_EOF
        fi
        ;;
  
@@ -313,12 +315,13 @@
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
        _LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5342,13 +5422,25 @@ _LT_EOF
+@@ -5342,15 +5423,28 @@ _LT_EOF
        _LT_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -348,8 +351,11 @@
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
        _LT_TAGVAR(hardcode_direct, $1)=yes
        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -5362,6 +5454,11 @@ _LT_EOF
+ 
+     newsos6)
+@@ -5362,6 +5456,11 @@ _LT_EOF
        ;;
  
      *nto* | *qnx*)
@@ -361,7 +367,7 @@
        ;;
  
      openbsd*)
-@@ -5819,9 +5916,7 @@ m4_defun([_LT_LANG_CXX_CONFIG],
+@@ -5819,9 +5918,7 @@ m4_defun([_LT_LANG_CXX_CONFIG],
  [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  m4_require([_LT_DECL_EGREP])dnl
  m4_require([_LT_PATH_MANIFEST_TOOL])dnl
@@ -372,7 +378,7 @@
    AC_PROG_CXXCPP
  else
    _lt_caught_CXX_error=yes
-@@ -6538,6 +6633,22 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6538,6 +6635,22 @@ if test "$_lt_caught_CXX_error" != yes; 
          _LT_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -395,7 +401,7 @@
        mvs*)
          case $cc_basename in
            cxx*)
-@@ -6552,15 +6663,12 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6552,15 +6665,13 @@ if test "$_lt_caught_CXX_error" != yes; 
        ;;
  
        netbsd*)
@@ -414,10 +420,11 @@
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
++      output_verbose_link_cmd=func_echo_all
        ;;
  
        *nto* | *qnx*)
-@@ -6740,9 +6848,9 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6740,9 +6851,9 @@ if test "$_lt_caught_CXX_error" != yes; 
            if test "$GXX" = yes && test "$with_gnu_ld" = no; then
              _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
              if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -429,7 +436,7 @@
  
                # Commands to make compiler produce verbose output that lists
                # what "hidden" libraries, object files and flags are used when
-@@ -6751,9 +6859,9 @@ if test "$_lt_caught_CXX_error" != yes; 
+@@ -6751,9 +6862,9 @@ if test "$_lt_caught_CXX_error" != yes; 
              else
                # g++ 2.7 appears to require `-G' NOT `-shared' on this
                # platform.
diff -r 5005376a4bfb -r 9645adaed853 devel/libtool/patches/manual.README
--- a/devel/libtool/patches/manual.README       Sat Mar 08 13:08:50 2014 +0000
+++ b/devel/libtool/patches/manual.README       Sat Mar 08 19:57:25 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: manual.README,v 1.11 2009/12/17 12:23:26 joerg Exp $
+$NetBSD: manual.README,v 1.12 2014/03/08 19:57:25 joerg Exp $
 
 The "manual-*" patch files are used to maintain the pkgsrc version of
 libtool.  These files contain patches for the .m4 files in libtool which are
@@ -24,8 +24,6 @@
 cp -f libltdl/configure libltdl/configure.orig
 ./bootstrap
 pkgdiff configure >/usr/pkgsrc/devel/libtool/patches/patch-ab
-cp -f acinclude.m4 libltdl/
-(cd libltdl && aclocal && make ./configure)
 pkgdiff libltdl/configure >/usr/pkgsrc/devel/libtool/patches/patch-ad
 cd /usr/pkgsrc/devel/libtool
 make makepatchsum
diff -r 5005376a4bfb -r 9645adaed853 devel/libtool/patches/patch-ab
--- a/devel/libtool/patches/patch-ab    Sat Mar 08 13:08:50 2014 +0000
+++ b/devel/libtool/patches/patch-ab    Sat Mar 08 19:57:25 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.77 2013/08/27 15:50:23 joerg Exp $
+$NetBSD: patch-ab,v 1.78 2014/03/08 19:57:25 joerg Exp $
 
---- configure.orig     2011-10-17 10:18:58.000000000 +0000
+--- configure.orig     2014-03-06 15:38:07.000000000 +0000
 +++ configure
 @@ -5335,7 +5335,7 @@ else
      lt_cv_sys_max_cmd_len=8192;
@@ -124,7 +124,7 @@
    *djgpp*)
      lt_prog_compiler_pic=
      ;;
-@@ -9608,16 +9644,28 @@ _LT_EOF
+@@ -9608,16 +9644,29 @@ _LT_EOF
        fi
        ;;
  
@@ -154,12 +154,13 @@
 +      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 +      hardcode_direct=yes
 +      hardcode_shlibpath_var=no
++      output_verbose_link_cmd=func_echo_all
 +      ;;
 +
      solaris*)
        if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
        ld_shlibs=no
-@@ -10026,7 +10074,7 @@ fi
+@@ -10026,7 +10075,7 @@ fi
    allow_undefined_flag="$_lt_dar_allow_undefined"
    case $cc_basename in
       ifort*) _lt_dar_can_shared=yes ;;
@@ -168,7 +169,7 @@
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
      output_verbose_link_cmd=func_echo_all
-@@ -10238,13 +10286,25 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+@@ -10238,15 +10287,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        link_all_deplibs=yes
        ;;
  
@@ -198,8 +199,11 @@
 +      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
++      output_verbose_link_cmd=func_echo_all
        ;;
-@@ -10258,6 +10318,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
+ 
+     newsos6)
+@@ -10258,6 +10320,11 @@ $as_echo "$lt_cv_irix_exported_symbol" >
        ;;
  
      *nto* | *qnx*)
@@ -211,7 +215,7 @@
        ;;
  
      openbsd*)
-@@ -11031,7 +11096,7 @@ dgux*)
+@@ -11031,7 +11098,7 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -220,7 +224,7 @@
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
    if test -x /usr/bin/objformat; then
-@@ -11045,7 +11110,7 @@ freebsd* | dragonfly*)
+@@ -11045,7 +11112,7 @@ freebsd* | dragonfly*)
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
@@ -229,7 +233,7 @@
        need_version=no
        need_lib_prefix=no
        ;;
-@@ -11068,13 +11133,24 @@ freebsd* | dragonfly*)
+@@ -11068,13 +11135,24 @@ freebsd* | dragonfly*)
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -255,7 +259,7 @@
  gnu*)
    version_type=linux # correct to gnu/linux during the next big refactor
    need_lib_prefix=no
-@@ -11162,12 +11238,7 @@ interix[3-9]*)
+@@ -11162,12 +11240,7 @@ interix[3-9]*)
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
@@ -269,7 +273,7 @@
    esac
    need_lib_prefix=no
    need_version=no
-@@ -11266,19 +11337,36 @@ fi
+@@ -11266,19 +11339,36 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -316,7 +320,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=yes
    hardcode_into_libs=yes
-@@ -11304,7 +11392,7 @@ newsos6)
+@@ -11304,7 +11394,7 @@ newsos6)
    ;;
  
  openbsd*)
@@ -325,7 +329,7 @@
    sys_lib_dlsearch_path_spec="/usr/lib"
    need_lib_prefix=no
    # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-@@ -11312,7 +11400,7 @@ openbsd*)
+@@ -11312,7 +11402,7 @@ openbsd*)
      openbsd3.3 | openbsd3.3.*)        need_version=yes ;;
      *)                                need_version=no  ;;
    esac
@@ -334,7 +338,7 @@
    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
-@@ -12847,6 +12935,9 @@ else
+@@ -12847,6 +12937,9 @@ else
      # at 6.2 and later dlopen does load deplibs.
      lt_cv_sys_dlopen_deplibs=yes
      ;;
@@ -344,7 +348,7 @@
    netbsd*)
      lt_cv_sys_dlopen_deplibs=yes
      ;;
-@@ -13536,9 +13627,7 @@ func_stripname_cnf ()
+@@ -13536,9 +13629,7 @@ func_stripname_cnf ()
    esac
  } # func_stripname_cnf
  
@@ -355,7 +359,7 @@
    ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -13786,7 +13875,10 @@ $RM -r conftest*
+@@ -13786,7 +13877,10 @@ $RM -r conftest*
      *) break;;
    esac
  done
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated databases/mysql55 to 5.5.38; databases/mys...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated math/R-xts to 0.9.7
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated databases/mysql55 to 5.5.38; databases/mys...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated math/R-xts to 0.9.7
Indexes:
Home | Main Index | Thread Index | Old Index