pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update to libtool-2.2.6b. This switches libtool to the...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f9c8af3e2603
branches: trunk
changeset: 568600:f9c8af3e2603
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Dec 15 17:35:36 2009 +0000
description:
Update to libtool-2.2.6b. This switches libtool to the new main branch.
Changes are many, important for pkgsrc:
- much higher speed (up to 30% faster for the overall build of libX11)
- less magic for detection of the tag
The pkgsrc integration of f2c has been changed to be more sane.
libtool itself now depends on the f2c frontend to use proper
auto-configuration and only fakes up the library. This part is
encapsulated in mk/compiler/f2c.mk.
diffstat:
devel/libltdl/Makefile | 8 +-
devel/libltdl/PLIST | 5 +-
devel/libltdl/buildlink3.mk | 4 +-
devel/libtool-base/Makefile | 5 +-
devel/libtool-base/PLIST | 49 +-
devel/libtool-info/Makefile | 12 +-
devel/libtool/Makefile | 12 +-
devel/libtool/Makefile.common | 5 +-
devel/libtool/PLIST | 2 -
devel/libtool/distinfo | 17 +-
devel/libtool/patches/manual-libtool.m4 | 442 +++---------
devel/libtool/patches/patch-aa | 31 +-
devel/libtool/patches/patch-ab | 980 ++++++++++-----------------
devel/libtool/patches/patch-ac | 187 +----
devel/libtool/patches/patch-ad | 1097 ++----------------------------
devel/libtool/patches/patch-ae | 93 --
mk/compiler/f2c.mk | 31 +-
17 files changed, 671 insertions(+), 2309 deletions(-)
diffs (truncated from 3752 to 300 lines):
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libltdl/Makefile
--- a/devel/libltdl/Makefile Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libltdl/Makefile Tue Dec 15 17:35:36 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/12/15 17:07:43 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/12/15 17:35:36 joerg Exp $
#
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/tool-/ltdl-/}
-PKGREVISION= 1
SVR4_PKGNAME= lltdl
COMMENT= Generic shared library support (libltdl abstraction library)
@@ -13,8 +12,9 @@
USE_LIBTOOL= yes
-CONFIGURE_ARGS+=--enable-libltdl-install
-BUILD_DIRS= ${WRKSRC}/libltdl
+CONFIGURE_ARGS+=--enable-ltdl-install
+
+CONFIGURE_DIRS= libltdl
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libltdl/PLIST
--- a/devel/libltdl/PLIST Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libltdl/PLIST Tue Dec 15 17:35:36 2009 +0000
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/14 19:03:45 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/12/15 17:35:36 joerg Exp $
+include/libltdl/lt_dlloader.h
+include/libltdl/lt_error.h
+include/libltdl/lt_system.h
include/ltdl.h
lib/libltdl.la
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libltdl/buildlink3.mk
--- a/devel/libltdl/buildlink3.mk Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libltdl/buildlink3.mk Tue Dec 15 17:35:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2009/12/15 17:35:36 joerg Exp $
.include "../../mk/bsd.fast.prefs.mk"
.if ${OPSYS} == "NetBSD"
@@ -14,7 +14,7 @@
.if !defined(LIBLTDL_BUILDLINK3_MK)
LIBLTDL_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libltdl+= libltdl>=1.5.10
+BUILDLINK_API_DEPENDS.libltdl+= libltdl>=2.2.6
BUILDLINK_PKGSRCDIR.libltdl?= ../../devel/libltdl
.include "../../mk/dlopen.buildlink3.mk"
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libtool-base/Makefile Tue Dec 15 17:35:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2009/07/08 21:01:44 markd Exp $
+# $NetBSD: Makefile,v 1.88 2009/12/15 17:35:37 joerg Exp $
###########################################################################
###########################################################################
@@ -26,7 +26,6 @@
.include "../../devel/libtool/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 2
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
@@ -64,7 +63,7 @@
# and Fortran compilers.
#
USE_LANGUAGES= c c++ fortran
-CONFIGURE_ARGS+= --with-tags=CXX,F77,GCJ
+CONFIGURE_ARGS+= --disable-ltdl-install
USE_TOOLS+= echo
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libtool-base/PLIST
--- a/devel/libtool-base/PLIST Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libtool-base/PLIST Tue Dec 15 17:35:36 2009 +0000
@@ -1,26 +1,53 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:48:56 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/12/15 17:35:37 joerg Exp $
bin/libtool
bin/libtoolize
${PLIST.shlibtool}bin/shlibtool
+share/aclocal/argz.m4
share/aclocal/libtool.m4
share/aclocal/ltdl.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/install-sh
+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/acinclude.m4
share/libtool/libltdl/aclocal.m4
+share/libtool/libltdl/argz.c
+share/libtool/libltdl/argz_.h
share/libtool/libltdl/config-h.in
-share/libtool/libltdl/config.guess
-share/libtool/libltdl/config.sub
share/libtool/libltdl/configure
share/libtool/libltdl/configure.ac
-share/libtool/libltdl/install-sh
+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/ltmain.sh
-share/libtool/libltdl/missing
-share/libtool/ltmain.sh
+share/libtool/libltdl/slist.c
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libtool-info/Makefile
--- a/devel/libtool-info/Makefile Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libtool-info/Makefile Tue Dec 15 17:35:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/11/01 08:59:03 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2009/12/15 17:35:37 joerg Exp $
#
.include "../../devel/libtool/Makefile.common"
@@ -13,6 +13,14 @@
USE_TOOLS+= makeinfo
INFO_FILES= # PLIST
-BUILD_DIRS= doc
+NO_CONFIGURE= yes
+
+INSTALLATION_DIRS= ${PKGINFODIR}
+
+do-build:
+ cd ${WRKSRC}/doc && ${MAKEINFO} --no-split libtool.texi
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/doc/libtool.info ${DESTDIR}${PREFIX}/${PKGINFODIR}
.include "../../mk/bsd.pkg.mk"
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libtool/Makefile
--- a/devel/libtool/Makefile Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libtool/Makefile Tue Dec 15 17:35:36 2009 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2005/07/19 10:20:07 grant Exp $
+# $NetBSD: Makefile,v 1.45 2009/12/15 17:35:36 joerg Exp $
+
+META_PACKAGE= # empty
.include "Makefile.common"
@@ -12,12 +14,4 @@
COMMENT= Generic shared library support script
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-do-patch:
-
-do-install:
- @${ECHO_MSG} this is only a meta package.
-
.include "../../mk/bsd.pkg.mk"
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libtool/Makefile.common
--- a/devel/libtool/Makefile.common Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libtool/Makefile.common Tue Dec 15 17:35:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.76 2009/06/13 06:46:43 rillig Exp $
+# $NetBSD: Makefile.common,v 1.77 2009/12/15 17:35:36 joerg Exp $
# used by devel/libltdl/Makefile
# used by devel/libtool-base/Makefile
# used by devel/libtool-info/Makefile
@@ -26,7 +26,8 @@
###########################################################################
###########################################################################
-DISTNAME= libtool-1.5.26
+DISTNAME= libtool-2.2.6b
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
CATEGORIES= devel pkgtools
MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libtool/PLIST
--- a/devel/libtool/PLIST Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libtool/PLIST Tue Dec 15 17:35:36 2009 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:46 zuntum Exp $
-@comment empty
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libtool/distinfo
--- a/devel/libtool/distinfo Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libtool/distinfo Tue Dec 15 17:35:36 2009 +0000
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.75 2009/12/15 17:07:43 joerg Exp $
+$NetBSD: distinfo,v 1.76 2009/12/15 17:35:36 joerg Exp $
-SHA1 (libtool-1.5.26.tar.gz) = 4c1738351736562a951a345e24f233d00953ec0a
-RMD160 (libtool-1.5.26.tar.gz) = 4d1d7dd0308b98e8f590723ae5daddb8da49ac11
-Size (libtool-1.5.26.tar.gz) = 2961939 bytes
-SHA1 (patch-aa) = 4c979de3439dfffa48295e094c1aee40c7e79fa6
-SHA1 (patch-ab) = 271e58419f0581f02b69094e865c16126b554f7b
-SHA1 (patch-ac) = 52f22f3f7a58e22d2240d0c6bb77455783ee5d70
-SHA1 (patch-ad) = e3e3164b1e9598deab233450a1f7a8262dd09d66
-SHA1 (patch-ae) = 958897656acd515487ddb0ae66cbc95e8531fbc4
+SHA1 (libtool-2.2.6b.tar.gz) = 5afa73c8ef9ebe64bbb438a0f8779c9036e43c55
+RMD160 (libtool-2.2.6b.tar.gz) = 02d8c1460946a1a0054b3ccb6b54d2404b53c2ef
+Size (libtool-2.2.6b.tar.gz) = 2347317 bytes
+SHA1 (patch-aa) = 84e916bf868ada2ebeffe940f03537fadd751751
+SHA1 (patch-ab) = e7664e0d958f9504381d281293afb2628bb26678
+SHA1 (patch-ac) = 8187bfc8436d2d7477a6a33c925c6d141804ad65
+SHA1 (patch-ad) = e79850d8aa270b1679b873255944d0967c6d7f34
diff -r 5fa277b351b8 -r f9c8af3e2603 devel/libtool/patches/manual-libtool.m4
--- a/devel/libtool/patches/manual-libtool.m4 Tue Dec 15 17:27:13 2009 +0000
+++ b/devel/libtool/patches/manual-libtool.m4 Tue Dec 15 17:35:36 2009 +0000
@@ -1,45 +1,20 @@
-$NetBSD: manual-libtool.m4,v 1.26 2009/07/08 21:01:43 markd Exp $
+$NetBSD: manual-libtool.m4,v 1.27 2009/12/15 17:35:37 joerg Exp $
-Local pkgsrc changes:
-- override the basename to point to the actual backend compiler,
- critical e.g. on Solaris
-- portability fixes for print on Interix
-- override for shlib naming policy on various platforms
-- QNX support
-- Interix3 support
-- disable static linkage on OS X by default
-- DragonFly support decoupled from FreeBSD
-- support g95 on NetBSD
-
---- libtool.m4.orig 2008-02-02 05:26:47.000000000 +1300
-+++ libtool.m4
-@@ -249,7 +249,10 @@ AC_DEFUN([_LT_CC_BASENAME],
+--- libltdl/m4/libtool.m4.orig 2008-09-05 13:54:41.000000000 +0200
++++ libltdl/m4/libtool.m4
+@@ -118,7 +118,10 @@ m4_defun([_LT_CC_BASENAME],
*) break;;
esac
done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+# Return the actual command name, not our pkgsrc wrapper name because several
+# decisions are made only based on compiler names
-+new_cc_temp=`$cc_temp --wrappee-name 2>/dev/null` || new_cc_temp="$cc_temp"
-+cc_basename=`$echo "X$new_cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++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-%%"`
])
-@@ -474,11 +477,11 @@ else
-
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
-- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-+ if test "X`(print -r - '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
-- echo='print -r'
-+ echo='print -r -'
- 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.
-@@ -820,6 +823,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
+@@ -1527,6 +1530,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
Home |
Main Index |
Thread Index |
Old Index