pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update libtool packages to 2.4.6.
details: https://anonhg.NetBSD.org/pkgsrc/rev/88990f4d6200
branches: trunk
changeset: 359316:88990f4d6200
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Mon Mar 06 16:14:07 2017 +0000
description:
Update libtool packages to 2.4.6.
Changes since 2.4.2 are too numerous to mention, with over 4,700 lines
in the ChangeLog file. However, this release does at least fix a large
number of build failures on SmartOS, and doesn't appear to cause any
obvious regressions in bulk builds performed by Joerg and myself.
Some pkgsrc cleanups while here, including merging the MirBSD patches
correctly. It couldn't be made much clearer how to properly integrate
patches here to ensure they are not lost. Next time you might not be so
fortunate!
diffstat:
devel/libtool-base/Makefile | 12 +-
devel/libtool-base/PLIST | 88 +-
devel/libtool-fortran/Makefile | 12 +-
devel/libtool/Makefile | 4 +-
devel/libtool/Makefile.common | 14 +-
devel/libtool/distinfo | 20 +-
devel/libtool/patches/manual-funclib.sh | 16 +
devel/libtool/patches/manual-libtool.m4 | 251 +-
devel/libtool/patches/manual-ltdl.m4 | 10 +-
devel/libtool/patches/manual-ltmain.in | 96 +
devel/libtool/patches/manual-ltmain.m4sh | 28 -
devel/libtool/patches/manual.README | 10 +-
devel/libtool/patches/patch-Makefile.in | 35 +
devel/libtool/patches/patch-aa | 33 -
devel/libtool/patches/patch-ab | 1573 --------------------
devel/libtool/patches/patch-ac | 106 -
devel/libtool/patches/patch-ad | 359 ----
devel/libtool/patches/patch-build-aux_depcomp | 17 +
devel/libtool/patches/patch-build-aux_ltmain.sh | 115 +
devel/libtool/patches/patch-configure | 1409 +++++++++++++++++
devel/libtool/patches/patch-libltdl_config_depcomp | 17 -
devel/libtool/patches/patch-libltdl_configure | 367 ++++
mk/configure/libtool-override.mk | 6 +-
23 files changed, 2259 insertions(+), 2339 deletions(-)
diffs (truncated from 4978 to 300 lines):
diff -r 43ff3fd9f72e -r 88990f4d6200 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Mon Mar 06 12:59:53 2017 +0000
+++ b/devel/libtool-base/Makefile Mon Mar 06 16:14:07 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.117 2016/07/09 06:38:10 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2017/03/06 16:14:07 jperkin Exp $
###########################################################################
###########################################################################
@@ -17,8 +17,13 @@
# these patch files properly; otherwise your changes WILL be lost on the
# next libtool update.
#
-# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
-# INSTRUCTIONS. There are no exceptions to this rule.
+# DO NOT MAKE CHANGES TO THESE FILES:
+#
+# patches/patch-build-aux_ltmain.sh
+# patches/patch-configure
+# patches/patch-libltdl_configure
+#
+# WITHOUT FOLLOWING THESE INSTRUCTIONS. There are no exceptions to this rule.
#
###########################################################################
###########################################################################
@@ -26,7 +31,6 @@
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 13
COMMENT= Generic shared library support script (the script itself)
diff -r 43ff3fd9f72e -r 88990f4d6200 devel/libtool-base/PLIST
--- a/devel/libtool-base/PLIST Mon Mar 06 12:59:53 2017 +0000
+++ b/devel/libtool-base/PLIST Mon Mar 06 16:14:07 2017 +0000
@@ -1,55 +1,55 @@
-@comment $NetBSD: PLIST,v 1.13 2013/04/12 13:44:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2017/03/06 16:14:07 jperkin Exp $
bin/libtool
bin/libtoolize
bin/shlibtool
man/man1/libtool.1
man/man1/libtoolize.1
-share/aclocal/argz.m4
share/aclocal/libtool.m4
+share/aclocal/ltargz.m4
share/aclocal/ltdl.m4
share/aclocal/ltoptions.m4
share/aclocal/ltsugar.m4
share/aclocal/ltversion.m4
share/aclocal/lt~obsolete.m4
-share/libtool/config/compile
-share/libtool/config/config.guess
-share/libtool/config/config.sub
-share/libtool/config/depcomp
-share/libtool/config/install-sh
-share/libtool/config/ltmain.sh
-share/libtool/config/missing
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/Makefile.inc
-share/libtool/libltdl/README
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/argz.c
-share/libtool/libltdl/argz_.h
-share/libtool/libltdl/config-h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.ac
-share/libtool/libltdl/libltdl/lt__alloc.h
-share/libtool/libltdl/libltdl/lt__dirent.h
-share/libtool/libltdl/libltdl/lt__glibc.h
-share/libtool/libltdl/libltdl/lt__private.h
-share/libtool/libltdl/libltdl/lt__strl.h
-share/libtool/libltdl/libltdl/lt_dlloader.h
-share/libtool/libltdl/libltdl/lt_error.h
-share/libtool/libltdl/libltdl/lt_system.h
-share/libtool/libltdl/libltdl/slist.h
-share/libtool/libltdl/loaders/dld_link.c
-share/libtool/libltdl/loaders/dlopen.c
-share/libtool/libltdl/loaders/dyld.c
-share/libtool/libltdl/loaders/load_add_on.c
-share/libtool/libltdl/loaders/loadlibrary.c
-share/libtool/libltdl/loaders/preopen.c
-share/libtool/libltdl/loaders/shl_load.c
-share/libtool/libltdl/lt__alloc.c
-share/libtool/libltdl/lt__dirent.c
-share/libtool/libltdl/lt__strl.c
-share/libtool/libltdl/lt_dlloader.c
-share/libtool/libltdl/lt_error.c
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/slist.c
+share/libtool/COPYING.LIB
+share/libtool/Makefile.am
+share/libtool/Makefile.in
+share/libtool/README
+share/libtool/aclocal.m4
+share/libtool/build-aux/compile
+share/libtool/build-aux/config.guess
+share/libtool/build-aux/config.sub
+share/libtool/build-aux/depcomp
+share/libtool/build-aux/install-sh
+share/libtool/build-aux/ltmain.sh
+share/libtool/build-aux/missing
+share/libtool/config-h.in
+share/libtool/configure
+share/libtool/configure.ac
+share/libtool/libltdl/lt__alloc.h
+share/libtool/libltdl/lt__argz_.h
+share/libtool/libltdl/lt__dirent.h
+share/libtool/libltdl/lt__glibc.h
+share/libtool/libltdl/lt__private.h
+share/libtool/libltdl/lt__strl.h
+share/libtool/libltdl/lt_dlloader.h
+share/libtool/libltdl/lt_error.h
+share/libtool/libltdl/lt_system.h
+share/libtool/libltdl/slist.h
+share/libtool/loaders/dld_link.c
+share/libtool/loaders/dlopen.c
+share/libtool/loaders/dyld.c
+share/libtool/loaders/load_add_on.c
+share/libtool/loaders/loadlibrary.c
+share/libtool/loaders/preopen.c
+share/libtool/loaders/shl_load.c
+share/libtool/lt__alloc.c
+share/libtool/lt__argz.c
+share/libtool/lt__dirent.c
+share/libtool/lt__strl.c
+share/libtool/lt_dlloader.c
+share/libtool/lt_error.c
+share/libtool/ltdl.c
+share/libtool/ltdl.h
+share/libtool/ltdl.mk
+share/libtool/slist.c
diff -r 43ff3fd9f72e -r 88990f4d6200 devel/libtool-fortran/Makefile
--- a/devel/libtool-fortran/Makefile Mon Mar 06 12:59:53 2017 +0000
+++ b/devel/libtool-fortran/Makefile Mon Mar 06 16:14:07 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/01/18 09:34:54 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2017/03/06 16:14:07 jperkin Exp $
###########################################################################
###########################################################################
@@ -17,8 +17,13 @@
# these patch files properly; otherwise your changes WILL be lost on the
# next libtool update.
#
-# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
-# INSTRUCTIONS. There are no exceptions to this rule.
+# DO NOT MAKE CHANGES TO THESE FILES:
+#
+# patches/patch-build-aux_ltmain.sh
+# patches/patch-configure
+# patches/patch-libltdl_configure
+#
+# WITHOUT FOLLOWING THESE INSTRUCTIONS. There are no exceptions to this rule.
#
###########################################################################
###########################################################################
@@ -28,7 +33,6 @@
FILESDIR= ${.CURDIR}/../libtool-base/files
PKGNAME= ${DISTNAME:S/-/-fortran-/}
-PKGREVISION= 9
COMMENT= Generic shared library support script (the script itself, incl. Fortran)
diff -r 43ff3fd9f72e -r 88990f4d6200 devel/libtool/Makefile
--- a/devel/libtool/Makefile Mon Mar 06 12:59:53 2017 +0000
+++ b/devel/libtool/Makefile Mon Mar 06 16:14:07 2017 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2016/07/09 06:38:09 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2017/03/06 16:14:07 jperkin Exp $
META_PACKAGE= # empty
.include "Makefile.common"
-PKGREVISION= 3
-
DEPENDS+= ${DISTNAME:S/-/-base-/}{,nb[0-9]*}:../../devel/libtool-base
DEPENDS+= ${DISTNAME:S/-/-fortran-/}{,nb[0-9]*}:../../devel/libtool-fortran
diff -r 43ff3fd9f72e -r 88990f4d6200 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common Mon Mar 06 12:59:53 2017 +0000
+++ b/devel/libtool/Makefile.common Mon Mar 06 16:14:07 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.82 2014/10/09 14:06:10 wiz Exp $
+# $NetBSD: Makefile.common,v 1.83 2017/03/06 16:14:07 jperkin Exp $
# used by devel/libltdl/Makefile
# used by devel/libtool-base/Makefile
# used by devel/libtool-fortran/Makefile
@@ -21,13 +21,18 @@
# these patch files properly; otherwise your changes WILL be lost on the
# next libtool update.
#
-# DO NOT MAKE CHANGES TO patch-ab OR patch-ad WITHOUT FOLLOWING THESE
-# INSTRUCTIONS. There are no exceptions to this rule.
+# DO NOT MAKE CHANGES TO THESE FILES:
+#
+# patches/patch-build-aux_ltmain.sh
+# patches/patch-configure
+# patches/patch-libltdl_configure
+#
+# WITHOUT FOLLOWING THESE INSTRUCTIONS. There are no exceptions to this rule.
#
###########################################################################
###########################################################################
-DISTNAME= libtool-2.4.2
+DISTNAME= libtool-2.4.6
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
CATEGORIES= devel pkgtools
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
@@ -38,6 +43,7 @@
CONFLICTS= glibtool-[0-9]*
+USE_TOOLS+= gm4
GNU_CONFIGURE= yes
DISTINFO_FILE= ${.CURDIR}/../../devel/libtool/distinfo
diff -r 43ff3fd9f72e -r 88990f4d6200 devel/libtool/distinfo
--- a/devel/libtool/distinfo Mon Mar 06 12:59:53 2017 +0000
+++ b/devel/libtool/distinfo Mon Mar 06 16:14:07 2017 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.102 2016/03/10 12:43:48 tnn Exp $
+$NetBSD: distinfo,v 1.103 2017/03/06 16:14:07 jperkin Exp $
-SHA1 (libtool-2.4.2.tar.gz) = 22b71a8b5ce3ad86e1094e7285981cae10e6ff88
-RMD160 (libtool-2.4.2.tar.gz) = b7153f3f1e1c50d8c04787cafccd4e19af62ec7d
-SHA512 (libtool-2.4.2.tar.gz) = 0e54af7bbec376f943f2b8e4f13631fe5627b099a37a5f0252e12bade76473b0a36a673529d594778064cd8632abdc43d8a20883d66d6b27738861afbb7e211d
-Size (libtool-2.4.2.tar.gz) = 2632347 bytes
-SHA1 (patch-aa) = 8fa167bebf27b7bc3008edd61408a0aede6bdf69
-SHA1 (patch-ab) = 621320ff0a2bf5c03f40b8bd1a1467471b22a3b6
-SHA1 (patch-ac) = fa8b0388f8f0469803c5869a23c3a1247eef70a1
-SHA1 (patch-ad) = 4cfe392ea272a4770407dc13104dbf17d640fdb8
-SHA1 (patch-libltdl_config_depcomp) = f8a5247e8c667b896bb426613f1b43d614760097
+SHA1 (libtool-2.4.6.tar.gz) = 25b6931265230a06f0fc2146df64c04e5ae6ec33
+RMD160 (libtool-2.4.6.tar.gz) = 6f4b4c3e89426652da3acffa707f71bb4ccee26a
+SHA512 (libtool-2.4.6.tar.gz) = 3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18
+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) = 818157dd9bf985657a0089a7d887304b71559837
+SHA1 (patch-libltdl_configure) = 87535836200547ceb8463a98e86561c2adf1f0ed
diff -r 43ff3fd9f72e -r 88990f4d6200 devel/libtool/patches/manual-funclib.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libtool/patches/manual-funclib.sh Mon Mar 06 16:14:07 2017 +0000
@@ -0,0 +1,16 @@
+$NetBSD: manual-funclib.sh,v 1.1 2017/03/06 16:14:07 jperkin Exp $
+
+Avoid pkgsrc variables which are not suitable here.
+
+--- build-aux/funclib.sh.orig 2015-01-20 19:18:37.000000000 +0000
++++ build-aux/funclib.sh
+@@ -244,6 +244,9 @@ test -z "$GREP" && {
+ # uses them if a suitable command of that name is not already available
+ # in the command search PATH.
+
++unset CP
++unset MV
++unset RM
+ : ${CP="cp -f"}
+ : ${ECHO="printf %s\n"}
+ : ${EGREP="$GREP -E"}
diff -r 43ff3fd9f72e -r 88990f4d6200 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4 Mon Mar 06 12:59:53 2017 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Mon Mar 06 16:14:07 2017 +0000
@@ -1,29 +1,45 @@
-$NetBSD: manual-libtool.m4,v 1.45 2016/03/10 12:43:48 tnn Exp $
+$NetBSD: manual-libtool.m4,v 1.46 2017/03/06 16:14:07 jperkin Exp $
+
+Support mirbsd/midnightbsd.
+Handle pkgsrc wrappers.
+Fixup output on various OS.
---- libltdl/m4/libtool.m4.orig 2011-10-17 10:17:05.000000000 +0000
-+++ libltdl/m4/libtool.m4
-@@ -123,7 +123,10 @@ m4_defun([_LT_CC_BASENAME],
- *) break;;
- esac
- done
--cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-+# Return the actual command name, not our pkgsrc wrapper name because several
-+# decisions are made only based on compiler names
-+if test -n "$cc_temp" && new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null`; then :; else new_cc_temp="$cc_temp"; fi
-+cc_basename=`$ECHO "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- ])
+--- m4/libtool.m4.orig 2015-01-20 16:15:19.000000000 +0000
++++ m4/libtool.m4
+@@ -117,7 +117,10 @@ func_cc_basename ()
+ *) break;;
+ esac
+ done
+- func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++ # Return the actual command name, not our pkgsrc wrapper name because several
++ # decisions are made only based on compiler names
Home |
Main Index |
Thread Index |
Old Index