From b0ae6f910e9405377d18e6d3f5bf67f3896aeee5 Mon Sep 17 00:00:00 2001 From: drochner Date: Tue, 15 Jul 2003 12:56:36 +0000 Subject: update to 5.2.1 most notable changes: * Added -M --memory-limit argument to dmalloc to limit allocations. * Due to public pressure, I've made free(0L) not an error by default. -some new format specifiers for logfile expansion -bugfixes pkgsrc: -build and install thread support (not tested with GNU pth so far) -arrgh - need a patch so that libraries are not stripped on install --- devel/dmalloc/Makefile | 8 +++--- devel/dmalloc/PLIST | 7 ++++-- devel/dmalloc/buildlink2.mk | 5 ++-- devel/dmalloc/distinfo | 7 +++--- devel/dmalloc/patches/patch-aa | 55 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 72 insertions(+), 10 deletions(-) create mode 100644 devel/dmalloc/patches/patch-aa (limited to 'devel') diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile index ec848c836c9..9fe4a3cc984 100644 --- a/devel/dmalloc/Makefile +++ b/devel/dmalloc/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2003/06/23 10:42:14 seb Exp $ +# $NetBSD: Makefile,v 1.7 2003/07/15 12:56:36 drochner Exp $ -DISTNAME= dmalloc-4.8.2 -PKGREVISION= 2 +DISTNAME= dmalloc-5.2.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dmalloc/} EXTRACT_SUFX= .tgz @@ -10,13 +9,16 @@ MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://www.dmalloc.com/ COMMENT= Run-time configurable debugging malloc library +USE_BUILDLINK2= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shlib CFLAGS+= -fPIC -DPIC +CONFIGURE_ARGS+= --enable-threads INSTALL_TARGET= install installinfo USE_NEW_TEXINFO= YES INFO_FILES= dmalloc.info +.include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/dmalloc/PLIST b/devel/dmalloc/PLIST index 254fb83edaa..95ea4a89eff 100644 --- a/devel/dmalloc/PLIST +++ b/devel/dmalloc/PLIST @@ -1,9 +1,12 @@ -@comment $NetBSD: PLIST,v 1.4 2003/06/23 10:42:14 seb Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/07/15 12:56:36 drochner Exp $ bin/dmalloc include/dmalloc.h info/dmalloc.info lib/libdmalloc.a lib/libdmalloc.so -lib/libdmalloclp.a +lib/libdmallocth.a +lib/libdmallocth.so +lib/libdmallocthcxx.a +lib/libdmallocthcxx.so lib/libdmallocxx.a lib/libdmallocxx.so diff --git a/devel/dmalloc/buildlink2.mk b/devel/dmalloc/buildlink2.mk index 21266916154..510f6e22541 100644 --- a/devel/dmalloc/buildlink2.mk +++ b/devel/dmalloc/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1 2002/10/21 01:38:37 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2003/07/15 12:56:36 drochner Exp $ # .if !defined(DMALLOC_BUILDLINK2_MK) @@ -14,8 +14,9 @@ EVAL_PREFIX+= BUILDLINK_PREFIX.dmalloc=dmalloc BUILDLINK_PREFIX.dmalloc_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.dmalloc+= include/dmalloc.h BUILDLINK_FILES.dmalloc+= lib/libdmalloc.* -BUILDLINK_FILES.dmalloc+= lib/libdmalloclp.* BUILDLINK_FILES.dmalloc+= lib/libdmallocxx.* +BUILDLINK_FILES.dmalloc+= lib/libdmallocth.* +BUILDLINK_FILES.dmalloc+= lib/libdmallocthcxx.* BUILDLINK_TARGETS+= dmalloc-buildlink diff --git a/devel/dmalloc/distinfo b/devel/dmalloc/distinfo index 30ab9bfb047..b4d20022382 100644 --- a/devel/dmalloc/distinfo +++ b/devel/dmalloc/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:16 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/07/15 12:56:37 drochner Exp $ -SHA1 (dmalloc-4.8.2.tgz) = 794c2392d7f1dadc0759dccfeb82d65859ab4b9d -Size (dmalloc-4.8.2.tgz) = 266186 bytes +SHA1 (dmalloc-5.2.1.tgz) = 4c49f4943d431c35b3a09c93b6f9ed6ebc0219d2 +Size (dmalloc-5.2.1.tgz) = 316998 bytes +SHA1 (patch-aa) = 175f6793635e57f5b6ab9f59aec8c64e6017888e diff --git a/devel/dmalloc/patches/patch-aa b/devel/dmalloc/patches/patch-aa new file mode 100644 index 00000000000..56053413c2b --- /dev/null +++ b/devel/dmalloc/patches/patch-aa @@ -0,0 +1,55 @@ +$NetBSD: patch-aa,v 1.1 2003/07/15 12:56:37 drochner Exp $ + +--- Makefile.in.orig 2003-07-15 13:50:59.000000000 +0200 ++++ Makefile.in 2003-07-15 13:52:59.000000000 +0200 +@@ -178,42 +178,42 @@ + + installthsl : $(LIB_TH_SL) + $(srcdir)/mkinstalldirs $(libdir) +- $(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir) ++ $(INSTALL_DATA) $(LIB_TH_SL) $(libdir) + + installth : $(INSTALL_THREADS) + $(srcdir)/mkinstalldirs $(libdir) +- $(INSTALL_PROGRAM) $(LIB_TH) $(libdir) ++ $(INSTALL_DATA) $(LIB_TH) $(libdir) + @CXX_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" + @SL_OFF@ @echo "Enter 'make installthsl' to install the threaded shared-library" + + installthcxxsl : $(LIB_TH_CXX_SL) + $(srcdir)/mkinstalldirs $(shlibdir) +- $(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir) ++ $(INSTALL_DATA) $(LIB_TH_CXX_SL) $(shlibdir) + + installthcxx : $(INSTALL_TH_CXX) + $(srcdir)/mkinstalldirs $(libdir) +- $(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir) ++ $(INSTALL_DATA) $(LIB_TH_CXX) $(libdir) + @SL_OFF@ @echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library" + + installcxxsl : $(LIB_CXX_SL) + $(srcdir)/mkinstalldirs $(libdir) +- $(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir) ++ $(INSTALL_DATA) $(LIB_CXX_SL) $(libdir) + + installcxx : $(INSTALL_CXX) + $(srcdir)/mkinstalldirs $(libdir) +- $(INSTALL_PROGRAM) $(LIB_CXX) $(libdir) ++ $(INSTALL_DATA) $(LIB_CXX) $(libdir) + @TH_OFF@ @echo "Enter 'make installthcxx' to install the threaded C++ library" + @SL_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" + + installsl : $(LIB_SL) + $(srcdir)/mkinstalldirs $(shlibdir) +- $(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir) ++ $(INSTALL_DATA) $(LIB_SL) $(shlibdir) + @CXX_OFF@ @echo "Enter 'make installcxxsl' to install the C++ shared-library" + @TH_OFF@ @echo "Enter 'make installthsl' to install thread shared-library" + + installlib : $(INSTALL_LIB) + $(srcdir)/mkinstalldirs $(libdir) +- $(INSTALL_PROGRAM) $(LIBRARY) $(libdir) ++ $(INSTALL_DATA) $(LIBRARY) $(libdir) + @RANLIB@ $(libdir)/$(LIBRARY) + @SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)" + @CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library" -- cgit v1.2.3