Attachment #63584 for bug #94792

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

Lines 6-16 Link Here

(-)Makefile (-3 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= dlmalloc	8	PORTNAME= dlmalloc
9	PORTVERSION= 2.6.5	9	PORTVERSION= 2.8.3
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ftp://gee.cs.oswego.edu/pub/misc/ \	11	MASTER_SITES= ftp://gee.cs.oswego.edu/pub/misc/ \
12	ftp://ftp.netsw.org/system/libs/memory/optimize/	12	ftp://ftp.netsw.org/system/libs/memory/optimize/
13	DISTFILES= malloc-2.6.5.c	13	DISTFILES= malloc-${PORTVERSION}.c malloc-${PORTVERSION}.h
14		14
15	MAINTAINER= roberto@FreeBSD.org	15	MAINTAINER= roberto@FreeBSD.org
16	COMMENT= Small, fast malloc library by Doug Lea	16	COMMENT= Small, fast malloc library by Doug Lea
Lines 18-27 Link Here
18	NO_WRKSUBDIR= yes	18	NO_WRKSUBDIR= yes
19	INSTALLS_SHLIB= yes	19	INSTALLS_SHLIB= yes
20		20
		21	USE_DOS2UNIX=${DISTFILES}
		22
21	do-extract:	23	do-extract:
22	@${RM} -rf ${WRKDIR}	24	@${RM} -rf ${WRKDIR}
23	@${MKDIR} ${WRKDIR}	25	@${MKDIR} ${WRKDIR}
24	${CP} -p ${DISTDIR}/${DISTFILES} ${WRKDIR}	26	.for f in ${DISTFILES}
		27	${CP} -p ${DISTDIR}/${f} ${WRKDIR}
		28	.endfor
25	${CP} -p ${FILESDIR}/Makefile ${WRKDIR}	29	${CP} -p ${FILESDIR}/Makefile ${WRKDIR}
26		30
27	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +6 lines)
1	MD5 (malloc-2.6.5.c) = 75293b0cf29dfeb964f7007c5992390e	1	MD5 (malloc-2.8.3.c) = 5ab95c5c6f3169d4322a0d22f81533cb
2	SHA256 (malloc-2.6.5.c) = ce4e1b0d557082c22e03f38c49a8df57eb27885fd1cbcdb80c3d3d35eafafc68	2	SHA256 (malloc-2.8.3.c) = 3a6f3917a0006ac0eb1a71c05e24fa1b043df9d21d195e462bccb4b443fd639c
3	SIZE (malloc-2.6.5.c) = 100972	3	SIZE (malloc-2.8.3.c) = 185082
		4	MD5 (malloc-2.8.3.h) = 994d1d2003401b9867908194b9373d52
		5	SHA256 (malloc-2.8.3.h) = df30b9fce0f04301d0e77fcacc73703c123381bbbfe4be4fe4887a09e3024f01
		6	SIZE (malloc-2.8.3.h) = 19808

Lines 1-3 Link Here

(-)pkg-plist (+2 lines)
		1	include/dlmalloc/malloc.h
1	lib/libdlmalloc.a	2	lib/libdlmalloc.a
2	lib/libdlmalloc.so	3	lib/libdlmalloc.so
3	lib/libdlmalloc.so.2.6	4	lib/libdlmalloc.so.2.6
		5	@dirrm include/dlmalloc




#  A version of malloc/free/realloc written by Doug Lea and released to the 
#  public domain. 
#
#  preliminary VERSION 2.8.3
#
#  working version; unreleased.
#

VER=2.8.3

LIBDIR=${PREFIX}/lib
INCDIR=${PREFIX}/include/dlmalloc

# for the shared lib stuff
.if ${PORTOBJFORMAT} == "elf"
VERSION=${VER:R:R}
.else
VERSION=${VER:R}
.endif

LIBMALLOC=libdlmalloc.a
LIBSMALLOC=libdlmalloc.so.${VERSION}

SRCS = malloc-${VER}.c

OBJS = $(SRCS:.c=.o)
SOBJS = $(SRCS:.c=.so)

install:
	install -c -m 644 ${LIBMALLOC} $(LIBDIR)
	-$(RANLIB) $(LIBDIR)/${LIBMALLOC}
	install -c -m 444 ${LIBSMALLOC} $(LIBDIR)
	ln -sf ${LIBSMALLOC} $(LIBDIR)/libdlmalloc.so
	mkdir -p ${INCDIR}
	install -c -m 444 malloc-${VER}.h ${INCDIR}/malloc.h

$(OBJS): $(SRCS)
$(SOBJS): $(SRCS)




--- malloc-2.8.3.c.orig	Tue Mar 21 18:15:49 2006
+++ malloc-2.8.3.c	Tue Mar 21 18:19:15 2006
@@ -1200,7 +1200,7 @@
 
 /* Preliminaries */
 
+#include <sys/param.h>
+
 #ifndef __STD_C
 #ifdef __STDC__
 #define __STD_C     1
@@ -495,7 +497,7 @@
 #  ifdef _SC_PAGE_SIZE
 #    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
 #  else

        extern size_t getpagesize();
 #      define malloc_getpagesize getpagesize()
 #    else
@@ -789,7 +791,9 @@
 #else /* INTERNAL_LINUX_C_LIB */
 
 #if __STD_C
+#    if !(defined(BSD) && (BSD >= 199306))
 extern Void_t*     sbrk(ptrdiff_t);
+#    endif
 #else
 extern Void_t*     sbrk();
 #endif

Return to bug 94792

Lines 7-30 Link Here

(-)files/Makefile (-5 / +10 lines)
7	# A version of malloc/free/realloc written by Doug Lea and released to the	7	# A version of malloc/free/realloc written by Doug Lea and released to the
8	# public domain.	8	# public domain.
9	#	9	#
10	# preliminary VERSION 2.6.5	10	# preliminary VERSION 2.8.3
11	#	11	#
12	# working version; unreleased.	12	# working version; unreleased.
13	#	13	#
14		14
		15	VER=2.8.3
		16
15	LIBDIR=${PREFIX}/lib	17	LIBDIR=${PREFIX}/lib
		18	INCDIR=${PREFIX}/include/dlmalloc
16		19
17	# for the shared lib stuff	20	# for the shared lib stuff
18	.if ${PORTOBJFORMAT} == "elf"	21	.if ${PORTOBJFORMAT} == "elf"
19	VERSION=2	22	VERSION=${VER:R:R}
20	.else	23	.else
21	VERSION=2.6	24	VERSION=${VER:R}
22	.endif	25	.endif
23		26
24	LIBMALLOC=libdlmalloc.a	27	LIBMALLOC=libdlmalloc.a
25	LIBSMALLOC=libdlmalloc.so.${VERSION}	28	LIBSMALLOC=libdlmalloc.so.${VERSION}
26		29
27	SRCS = malloc-2.6.5.c	30	SRCS = malloc-${VER}.c
28		31
29	OBJS = $(SRCS:.c=.o)	32	OBJS = $(SRCS:.c=.o)
30	SOBJS = $(SRCS:.c=.so)	33	SOBJS = $(SRCS:.c=.so)
Lines 61-68 Link Here
61	install:	64	install:
62	install -c -m 644 ${LIBMALLOC} $(LIBDIR)	65	install -c -m 644 ${LIBMALLOC} $(LIBDIR)
63	-$(RANLIB) $(LIBDIR)/${LIBMALLOC}	66	-$(RANLIB) $(LIBDIR)/${LIBMALLOC}
64	install -c -m 555 ${LIBSMALLOC} $(LIBDIR)	67	install -c -m 444 ${LIBSMALLOC} $(LIBDIR)
65	ln -sf ${LIBSMALLOC} $(LIBDIR)/libdlmalloc.so	68	ln -sf ${LIBSMALLOC} $(LIBDIR)/libdlmalloc.so
		69	mkdir -p ${INCDIR}
		70	install -c -m 444 malloc-${VER}.h ${INCDIR}/malloc.h
66		71
67	$(OBJS): $(SRCS)	72	$(OBJS): $(SRCS)
68	$(SOBJS): $(SRCS)	73	$(SOBJS): $(SRCS)

Lines 1-15 Link Here

(-)files/patch-aa (-22 / +3 lines)
1	--- malloc-2.6.5.c.orig Thu Nov 28 06:07:12 1996	1	--- malloc-2.8.3.c.orig Tue Mar 21 18:15:49 2006
2	+++ malloc-2.6.5.c Sun Apr 20 17:25:42 1997	2	+++ malloc-2.8.3.c Tue Mar 21 18:19:15 2006
3	@@ -221,6 +221,8 @@	3	@@ -1200,7 +1200,7 @@
4
5	/* Preliminaries */
6
7	+#include <sys/param.h>
8	+
9	#ifndef __STD_C
10	#ifdef __STDC__
11	#define __STD_C 1
12	@@ -495,7 +497,7 @@
13	# ifdef _SC_PAGE_SIZE	4	# ifdef _SC_PAGE_SIZE
14	# define malloc_getpagesize sysconf(_SC_PAGE_SIZE)	5	# define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
15	# else	6	# else
Lines 18-30 Link Here
18	extern size_t getpagesize();	9	extern size_t getpagesize();
19	# define malloc_getpagesize getpagesize()	10	# define malloc_getpagesize getpagesize()
20	# else	11	# else
21	@@ -789,7 +791,9 @@
22	#else /* INTERNAL_LINUX_C_LIB */
23
24	#if __STD_C
25	+# if !(defined(BSD) && (BSD >= 199306))
26	extern Void_t* sbrk(ptrdiff_t);
27	+# endif
28	#else
29	extern Void_t* sbrk();
30	#endif