Attachment 63584 Details for Bug 94792 – libdlmalloc_2.6.5-2.8.3.diff

[patch] libdlmalloc_2.6.5-2.8.3.diff

libdlmalloc_2.6.5-2.8.3.diff (text/plain), 4.46 KB, created by Vasil Dimov on 2006-03-21 17:00:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vasil Dimov

Created: 2006-03-21 17:00:33 UTC

Size: 4.46 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/libdlmalloc/Makefile,v
>retrieving revision 1.20
>diff -u -r1.20 Makefile
>--- Makefile	26 Oct 2003 06:55:51 -0000	1.20
>+++ Makefile	21 Mar 2006 16:52:06 -0000
>@@ -6,11 +6,11 @@
> #
> 
> PORTNAME=	dlmalloc
>-PORTVERSION=	2.6.5
>+PORTVERSION=	2.8.3
> CATEGORIES=	devel
> MASTER_SITES=	ftp://gee.cs.oswego.edu/pub/misc/  \
> 		ftp://ftp.netsw.org/system/libs/memory/optimize/
>-DISTFILES=	malloc-2.6.5.c
>+DISTFILES=	malloc-${PORTVERSION}.c malloc-${PORTVERSION}.h
> 
> MAINTAINER=	roberto@FreeBSD.org
> COMMENT=	Small, fast malloc library by Doug Lea
>@@ -18,10 +18,14 @@
> NO_WRKSUBDIR=	yes
> INSTALLS_SHLIB=	yes
> 
>+USE_DOS2UNIX=${DISTFILES}
>+
> do-extract:
> 	@${RM} -rf ${WRKDIR}
> 	@${MKDIR} ${WRKDIR}
>-	${CP} -p ${DISTDIR}/${DISTFILES} ${WRKDIR}
>+.for f in ${DISTFILES}
>+	${CP} -p ${DISTDIR}/${f} ${WRKDIR}
>+.endfor
> 	${CP} -p ${FILESDIR}/Makefile ${WRKDIR}
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/devel/libdlmalloc/distinfo,v
>retrieving revision 1.5
>diff -u -r1.5 distinfo
>--- distinfo	22 Jan 2006 08:28:22 -0000	1.5
>+++ distinfo	21 Mar 2006 16:52:06 -0000
>@@ -1,3 +1,6 @@
>-MD5 (malloc-2.6.5.c) = 75293b0cf29dfeb964f7007c5992390e
>-SHA256 (malloc-2.6.5.c) = ce4e1b0d557082c22e03f38c49a8df57eb27885fd1cbcdb80c3d3d35eafafc68
>-SIZE (malloc-2.6.5.c) = 100972
>+MD5 (malloc-2.8.3.c) = 5ab95c5c6f3169d4322a0d22f81533cb
>+SHA256 (malloc-2.8.3.c) = 3a6f3917a0006ac0eb1a71c05e24fa1b043df9d21d195e462bccb4b443fd639c
>+SIZE (malloc-2.8.3.c) = 185082
>+MD5 (malloc-2.8.3.h) = 994d1d2003401b9867908194b9373d52
>+SHA256 (malloc-2.8.3.h) = df30b9fce0f04301d0e77fcacc73703c123381bbbfe4be4fe4887a09e3024f01
>+SIZE (malloc-2.8.3.h) = 19808
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/devel/libdlmalloc/pkg-plist,v
>retrieving revision 1.8
>diff -u -r1.8 pkg-plist
>--- pkg-plist	16 Jun 2000 08:47:14 -0000	1.8
>+++ pkg-plist	21 Mar 2006 16:52:06 -0000
>@@ -1,3 +1,5 @@
>+include/dlmalloc/malloc.h
> lib/libdlmalloc.a
> lib/libdlmalloc.so
> lib/libdlmalloc.so.2.6
>+@dirrm include/dlmalloc
>Index: files/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/libdlmalloc/files/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- files/Makefile	4 Apr 1999 15:16:26 -0000	1.4
>+++ files/Makefile	21 Mar 2006 16:52:06 -0000
>@@ -7,24 +7,27 @@
> #  A version of malloc/free/realloc written by Doug Lea and released to the 
> #  public domain. 
> #
>-#  preliminary VERSION 2.6.5
>+#  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=2
>+VERSION=${VER:R:R}
> .else
>-VERSION=2.6
>+VERSION=${VER:R}
> .endif
> 
> LIBMALLOC=libdlmalloc.a
> LIBSMALLOC=libdlmalloc.so.${VERSION}
> 
>-SRCS = malloc-2.6.5.c
>+SRCS = malloc-${VER}.c
> 
> OBJS = $(SRCS:.c=.o)
> SOBJS = $(SRCS:.c=.so)
>@@ -61,8 +64,10 @@
> install:
> 	install -c -m 644 ${LIBMALLOC} $(LIBDIR)
> 	-$(RANLIB) $(LIBDIR)/${LIBMALLOC}
>-	install -c -m 555 ${LIBSMALLOC} $(LIBDIR)
>+	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)
>Index: files/patch-aa
>===================================================================
>RCS file: /home/pcvs/ports/devel/libdlmalloc/files/patch-aa,v
>retrieving revision 1.3
>diff -u -r1.3 patch-aa
>--- files/patch-aa	25 Apr 1999 13:55:17 -0000	1.3
>+++ files/patch-aa	21 Mar 2006 16:52:06 -0000
>@@ -1,15 +1,6 @@
>---- malloc-2.6.5.c.orig	Thu Nov 28 06:07:12 1996
>-+++ malloc-2.6.5.c	Sun Apr 20 17:25:42 1997
>-@@ -221,6 +221,8 @@
>- 
>- /* Preliminaries */
>- 
>-+#include <sys/param.h>
>-+
>- #ifndef __STD_C
>- #ifdef __STDC__
>- #define __STD_C     1
>-@@ -495,7 +497,7 @@
>+--- 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 @@
>  #  ifdef _SC_PAGE_SIZE
>  #    define malloc_getpagesize sysconf(_SC_PAGE_SIZE)
>  #  else
>@@ -18,13 +9,3 @@
>         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

Actions: View | Diff

Attachments on bug 94792: 63584