Attachment #89962 for bug #127012

View | Details | Raw Unified | Return to bug 127012
Collapse All | Expand All




# $FreeBSD: ports/devel/ptmalloc/Makefile,v 1.7 2008/08/21 07:08:31 vd Exp $

PORTNAME=	ptmalloc
PORTVERSION=	3.0
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://www.malloc.de/malloc/
DISTNAME=	${PORTNAME}3-current

MAINTAINER=	giffunip@tutopia.com
COMMENT=	Alternative threads-aware malloc

USE_LD_CONFIG=	yes
WRKSRC=	${WRKDIR}/${PORTNAME}3

USE_GMAKE=	yes
ALL_TARGET=	posix

INCDIR=	include/${PORTNAME}


do-install:	all
	${MKDIR} ${PREFIX}/${INCDIR}
	${INSTALL_DATA} ${WRKSRC}/malloc-2.8.3.h ${PREFIX}/${INCDIR}/
	${INSTALL_DATA} ${WRKSRC}/libptmalloc3.a ${PREFIX}/lib/libptmalloc.a
	${INSTALL_DATA} ${WRKSRC}/ptmalloc3.so ${PREFIX}/lib/libptmalloc.so.3
	${LN} -s ${PREFIX}/lib/ptmalloc.so.3 ${PREFIX}/lib/libptmalloc.so

regression-test: build
	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check

Lines 1-3 Link Here

(-)ptmalloc/distinfo (-3 / +3 lines)
1	MD5 (ptmalloc2-current.tar.gz) = 3db9e72c01ce55da006cdc56b966d7fa	1	MD5 (ptmalloc3-current.tar.gz) = c0b9dd5f16f8eae979166dc74b60015c
2	SHA256 (ptmalloc2-current.tar.gz) = 46a5691b19557fde3c3b97c3d86649a40cf5a2a1f4129c37b360907dd1fbdd5a	2	SHA256 (ptmalloc3-current.tar.gz) = f353606f24a579597a1ff5b51009a45d75da047b3975d82c3f613f85bcf312db
3	SIZE (ptmalloc2-current.tar.gz) = 78594	3	SIZE (ptmalloc3-current.tar.gz) = 82712




--- Makefile.orig	2006-03-31 11:25:23.000000000 -0500
+++ Makefile	2008-08-30 17:37:37.000000000 -0500
@@ -17,12 +17,12 @@
 TAR_FLAGS = --numeric-owner --exclude "*~" --exclude "debian/tmp*"
 
 #CC = /pkg/gcc-2.95.2-wg/bin/gcc
-CC = gcc
+CC ?= cc
 
 SYS_FLAGS  =
-OPT_FLAGS  = -g -O2 #-O # -O2
+OPT_FLAGS  = -O2 #-O # -O2
 WARN_FLAGS = -Wall -Wstrict-prototypes
-SH_FLAGS   = -shared -fpic
+SH_FLAGS   = -shared -fPIC
 
 INC_FLAGS  = -Isysdeps/generic
 
@@ -44,17 +44,20 @@
 MALLOC_OBJ = ptmalloc3.o malloc.o
 LIB_MALLOC = libptmalloc3.a
 
+# Target libraries
+LIBS = libptmalloc3.a ptmalloc3.so
+
 T_SUF =
 AR        = ar
 RANLIB    = ranlib
@@ -46,12 +49,12 @@
 TESTS = t-test1$(T_SUF) t-test2$(T_SUF) \
 	tst-independent-alloc$(T_SUF)
         #m-test1$(T_SUF) tst-mallocstate$(T_SUF) tst-mstats$(T_SUF)
 
-CFLAGS = $(SYS_FLAGS) $(OPT_FLAGS) $(WARN_FLAGS) $(THR_FLAGS) $(INC_FLAGS)
+CFLAGS += $(SYS_FLAGS) $(OPT_FLAGS) $(WARN_FLAGS) $(THR_FLAGS) $(INC_FLAGS)

-all: $(LIB_MALLOC) $(TESTS)
+all: $(LIBS) $(TESTS)
 
 ptmalloc3.o: ptmalloc3.c malloc-2.8.3.h
 	$(CC) -c $(CFLAGS) $(M_FLAGS) -DMSPACES=1 $<
@@ -72,6 +75,9 @@
 libptmalloc3.so: $(MALLOC_OBJ)
 	$(CC) $(SH_FLAGS) $(CFLAGS) $(M_FLAGS) $(MALLOC_OBJ) -o $@
  OPT_FLAGS='$(OPT_FLAGS)' SYS_FLAGS='$(SYS_FLAGS)' CC='$(CC)' \
- INC_FLAGS='-Isysdeps/pthread -Isysdeps/generic -I.'
+ INC_FLAGS='-Isysdeps/pthread -Isysdeps/generic -I.'	\
  THR_LIBS=-lpthread
 
+ptmalloc3.so: ptmalloc3.c malloc-2.8.3.h
+	$(CC) $(SH_FLAGS) $(CFLAGS) $(M_FLAGS) ptmalloc3.c -o $@
+
 again:
 	$(RM) $(TESTS)
 	$(MAKE) $(TESTS)




This package is a modified version of Doug Lea's malloc-2.8.3
implementation adapted for multiple threads, while trying to
avoid lock contention as much as possible.

As part of the GNU C library, the source files may be available under
the GNU Library General Public License (see the comments in the
files).  But as part of this stand-alone package, the code is also
available under the (probably less restrictive) conditions described
in the file 'COPYRIGHT'.  In any case, there is no warranty whatsoever
for this package.
  documentation, and (ii) the name of Wolfram Gloger may not be used
  in any advertising or publicity relating to the software.
  
  THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
  EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
  WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
  
  IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
  INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
  DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
  WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY
  THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.

This release was partly funded by Pixar Animation Studios.
worth installing.  It appears that the GNU libc man page malloc(3)
applies, but it's not included here for copyright reasons.

WWW: http://www.malloc.de/en/




Copyright (c) 2001-2006 Wolfram Gloger

Permission to use, copy, modify, distribute, and sell this software
and its documentation for any purpose is hereby granted without fee,
provided that (i) the above copyright notices and this permission
notice appear in all copies of the software and related documentation,
and (ii) the name of Wolfram Gloger may not be used in any advertising
or publicity relating to the software.

THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.

IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.

Return to bug 127012

Lines 6-22 Link Here

(-)ptmalloc/Makefile (-8 / +9 lines)
6	# $FreeBSD: ports/devel/ptmalloc/Makefile,v 1.7 2008/08/21 07:08:31 vd Exp $	6	# $FreeBSD: ports/devel/ptmalloc/Makefile,v 1.7 2008/08/21 07:08:31 vd Exp $
7		7
8	PORTNAME= ptmalloc	8	PORTNAME= ptmalloc
9	PORTVERSION= 2.0	9	PORTVERSION= 3.0
10	PORTREVISION= 1
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= http://www.malloc.de/malloc/	11	MASTER_SITES= http://www.malloc.de/malloc/
13	DISTNAME= ${PORTNAME}2-current	12	DISTNAME= ${PORTNAME}3-current
14		13
15	MAINTAINER= giffunip@tutopia.com	14	MAINTAINER= giffunip@tutopia.com
16	COMMENT= Alternative threads-aware malloc	15	COMMENT= Alternative threads-aware malloc
17		16
18	USE_LD_CONFIG= yes	17	USE_LD_CONFIG= yes
19	WRKSRC= ${WRKDIR}/${PORTNAME}2	18	WRKSRC= ${WRKDIR}/${PORTNAME}3
		19
		20	USE_GMAKE= yes
20	ALL_TARGET= posix	21	ALL_TARGET= posix
21		22
22	INCDIR= include/${PORTNAME}	23	INCDIR= include/${PORTNAME}
Lines 28-37 Link Here
28		29
29	do-install: all	30	do-install: all
30	${MKDIR} ${PREFIX}/${INCDIR}	31	${MKDIR} ${PREFIX}/${INCDIR}
31	${INSTALL_DATA} ${WRKSRC}/malloc.h ${PREFIX}/${INCDIR}/	32	${INSTALL_DATA} ${WRKSRC}/malloc-2.8.3.h ${PREFIX}/${INCDIR}/
32	${INSTALL_DATA} ${WRKSRC}/malloc.so ${PREFIX}/lib/libptmalloc.so.2	33	${INSTALL_DATA} ${WRKSRC}/libptmalloc3.a ${PREFIX}/lib/libptmalloc.a
33	${LN} -s ${PREFIX}/lib/ptmalloc.so.2 ${PREFIX}/lib/libptmalloc.so	34	${INSTALL_DATA} ${WRKSRC}/ptmalloc3.so ${PREFIX}/lib/libptmalloc.so.3
34	${INSTALL_DATA} ${WRKSRC}/libmalloc.a ${PREFIX}/lib/libptmalloc.a	35	${LN} -s ${PREFIX}/lib/ptmalloc.so.3 ${PREFIX}/lib/libptmalloc.so
35		36
36	regression-test: build	37	regression-test: build
37	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check	38	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check

Lines 1-34 Link Here

(-)ptmalloc/files/patch-Makefile (-26 / +25 lines)
1	--- Makefile.orig 2006-06-05 06:13:57.000000000 -0500	1	--- Makefile.orig 2006-03-31 11:25:23.000000000 -0500
2	+++ Makefile 2008-06-17 20:56:10.000000000 -0500	2	+++ Makefile 2008-08-30 17:37:37.000000000 -0500
3	@@ -15,12 +15,12 @@	3	@@ -17,12 +17,12 @@
4	TAR_FLAGS = --numeric-owner --exclude "~" --exclude "debian/tmp"	4	TAR_FLAGS = --numeric-owner --exclude "~" --exclude "debian/tmp"
5		5
6	#CC = /pkg/gcc-2.95.2-wg/bin/gcc	6	#CC = /pkg/gcc-2.95.2-wg/bin/gcc
7	-CC = cc	7	-CC = gcc
8	+CC ?= cc	8	+CC ?= cc
9		9
10	SYS_FLAGS =	10	SYS_FLAGS =
11	-OPT_FLAGS = -g -O # -O2	11	-OPT_FLAGS = -g -O2 #-O # -O2
12	+OPT_FLAGS = -O2 # -O2	12	+OPT_FLAGS = -O2 #-O # -O2
13	WARN_FLAGS = #-Wall -Wstrict-prototypes	13	WARN_FLAGS = -Wall -Wstrict-prototypes
14	-SH_FLAGS = -shared -fpic	14	-SH_FLAGS = -shared -fpic
15	+SH_FLAGS = -shared -fPIC	15	+SH_FLAGS = -shared -fPIC
16		16
17	INC_FLAGS = -Isysdeps/generic	17	INC_FLAGS = -Isysdeps/generic
18		18
19	@@ -35,6 +35,9 @@	19	@@ -44,17 +44,20 @@
20	THR_FLAGS = -DUSE_TSD_DATA_HACK -D_REENTRANT	20	MALLOC_OBJ = ptmalloc3.o malloc.o
21	THR_LIBS = -lpthread	21	LIB_MALLOC = libptmalloc3.a
22		22
23	+# Target libraries	23	+# Target libraries
24	+LIBS= libmalloc.a malloc.so	24	+LIBS = libptmalloc3.a ptmalloc3.so
25	+	25	+
26	RM = rm -f	26	T_SUF =
27	AR = ar
28	RANLIB = ranlib
29	@@ -46,12 +49,12 @@
30	TESTS = t-test1$(T_SUF) t-test2$(T_SUF) \	27	TESTS = t-test1$(T_SUF) t-test2$(T_SUF) \
31	tst-mallocstate$(T_SUF) tst-mstats$(T_SUF)	28	tst-independent-alloc$(T_SUF)
		29	#m-test1$(T_SUF) tst-mallocstate$(T_SUF) tst-mstats$(T_SUF)
32		30
33	-CFLAGS = $(SYS_FLAGS) $(OPT_FLAGS) $(WARN_FLAGS) $(THR_FLAGS) $(INC_FLAGS)	31	-CFLAGS = $(SYS_FLAGS) $(OPT_FLAGS) $(WARN_FLAGS) $(THR_FLAGS) $(INC_FLAGS)
34	+CFLAGS += $(SYS_FLAGS) $(OPT_FLAGS) $(WARN_FLAGS) $(THR_FLAGS) $(INC_FLAGS)	32	+CFLAGS += $(SYS_FLAGS) $(OPT_FLAGS) $(WARN_FLAGS) $(THR_FLAGS) $(INC_FLAGS)
Lines 39-52 Link Here
39	-all: $(LIB_MALLOC) $(TESTS)	37	-all: $(LIB_MALLOC) $(TESTS)
40	+all: $(LIBS) $(TESTS)	38	+all: $(LIBS) $(TESTS)
41		39
42	malloc.o: malloc.c malloc.h	40	ptmalloc3.o: ptmalloc3.c malloc-2.8.3.h
43	$(CC) -c $(CFLAGS) $(M_FLAGS) $<	41	$(CC) -c $(CFLAGS) $(M_FLAGS) -DMSPACES=1 $<
44	@@ -102,7 +105,7 @@	42	@@ -72,6 +75,9 @@
45	posix:	43	libptmalloc3.so: $(MALLOC_OBJ)
46	$(MAKE) THR_FLAGS='-DUSE_TSD_DATA_HACK -D_REENTRANT' \	44	$(CC) $(SH_FLAGS) $(CFLAGS) $(M_FLAGS) $(MALLOC_OBJ) -o $@
47	OPT_FLAGS='$(OPT_FLAGS)' SYS_FLAGS='$(SYS_FLAGS)' CC='$(CC)' \
48	- INC_FLAGS='-Isysdeps/pthread -Isysdeps/generic -I.'
49	+ INC_FLAGS='-Isysdeps/pthread -Isysdeps/generic -I.' \
50	THR_LIBS=-lpthread
51		45
52	# posix threads with explicit initialization. Known to be needed on HPUX.	46	+ptmalloc3.so: ptmalloc3.c malloc-2.8.3.h
		47	+ $(CC) $(SH_FLAGS) $(CFLAGS) $(M_FLAGS) ptmalloc3.c -o $@
		48	+
		49	again:
		50	$(RM) $(TESTS)
		51	$(MAKE) $(TESTS)

Lines 1-28 Link Here

(-)ptmalloc/pkg-descr (-24 / +10 lines)
1	ptmalloc is the original version of the malloc that was later included	1	This package is a modified version of Doug Lea's malloc-2.8.3
2	in GNU libc. This version is also but not exclusively LGPL:	2	implementation adapted for multiple threads, while trying to
		3	avoid lock contention as much as possible.
3		4
4	Copyright (c) 2001-2006 Wolfram Gloger	5	As part of the GNU C library, the source files may be available under
5		6	the GNU Library General Public License (see the comments in the
6	Permission to use, copy, modify, distribute, and sell this software	7	files). But as part of this stand-alone package, the code is also
7	and its documentation for any purpose is hereby granted without fee,	8	available under the (probably less restrictive) conditions described
8	provided that (i) the above copyright notices and this permission	9	in the file 'COPYRIGHT'. In any case, there is no warranty whatsoever
9	notice appear in all copies of the software and related	10	for this package.
10	documentation, and (ii) the name of Wolfram Gloger may not be used
11	in any advertising or publicity relating to the software.
12
13	THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
14	EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
15	WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
16
17	IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
18	INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
19	DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
20	WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY
21	THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
22	PERFORMANCE OF THIS SOFTWARE.
23		11
24	This package comes with no documentation beyond a README, which isn't	12	This release was partly funded by Pixar Animation Studios.
25	worth installing. It appears that the GNU libc man page malloc(3)
26	applies, but it's not included here for copyright reasons.
27		13
28	WWW: http://www.malloc.de/en/	14	WWW: http://www.malloc.de/en/

Line 0 Link Here

(-)ptmalloc/pkg-message (+19 lines)
	1	Copyright (c) 2001-2006 Wolfram Gloger
	2
	3	Permission to use, copy, modify, distribute, and sell this software
	4	and its documentation for any purpose is hereby granted without fee,
	5	provided that (i) the above copyright notices and this permission
	6	notice appear in all copies of the software and related documentation,
	7	and (ii) the name of Wolfram Gloger may not be used in any advertising
	8	or publicity relating to the software.
	9
	10	THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
	11	EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
	12	WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
	13
	14	IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
	15	INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
	16	DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
	17	WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
	18	OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
	19	PERFORMANCE OF THIS SOFTWARE.