1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-25 00:51:21 +00:00

Upgrade to 2.6.4.

Mention that doc files are at http://g.oswego.edu/dl/html/malloc.html
This commit is contained in:
David E. O'Brien 1997-04-21 00:30:35 +00:00
parent 9c52e2270b
commit 11eae40ef2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=6255
5 changed files with 45 additions and 65 deletions

View File

@ -3,14 +3,14 @@
# Date created: 3 June 1995
# Whom: roberto
#
# $Id: Makefile,v 1.3 1995/11/26 11:29:07 asami Exp $
# $Id: Makefile,v 1.4 1996/11/18 11:22:44 asami Exp $
#
DISTNAME= dlmalloc
PKGNAME= dlmalloc-2.5.3b
PKGNAME= dlmalloc-2.6.4
CATEGORIES= devel
MASTER_SITES= ftp://gee.cs.oswego.edu/pub/misc/
DISTFILES= malloc-2.5.3b.c
DISTFILES= malloc-2.6.4.c
MAINTAINER= roberto@FreeBSD.ORG
@ -19,9 +19,9 @@ NO_CONFIGURE= yes
do-extract:
@rm -rf ${WRKDIR}
@mkdir -p ${WRKDIR}
cp -p ${DISTDIR}/${DISTFILES} ${WRKDIR}
cp -p ${FILESDIR}/Makefile ${WRKDIR}
@${MKDIR} ${WRKDIR}
${CP} -p ${DISTDIR}/${DISTFILES} ${WRKDIR}
${CP} -p ${FILESDIR}/Makefile ${WRKDIR}
post-install:
ldconfig -m ${PREFIX}/lib

View File

@ -1 +1 @@
MD5 (malloc-2.5.3b.c) = 7936180a964854d052ae13ce6e1015d7
MD5 (malloc-2.6.4.c) = 90829e1a88274319109f9234a05cc577

View File

@ -15,15 +15,15 @@
LIBDIR=${PREFIX}/lib
# for the shared lib stuff
VERSION=2.5
VERSION=2.6
LIBMALLOC=libdlmalloc.a
LIBSMALLOC=libdlmalloc.so.${VERSION}
SRCS = malloc-2.5.3b.c
SRCS = malloc-2.6.4.c
OBJS = malloc-2.5.3b.o
SOBJS = malloc-2.5.3b.so
OBJS = $(SRCS:.c=.o)
SOBJS = $(SRCS:.c=.so)
.SUFFIXES:
.SUFFIXES: .out .o .po .so .s .S .c .cc .cxx .m .C .f .y .l
@ -55,5 +55,5 @@ install:
-$(RANLIB) $(LIBDIR)/${LIBMALLOC}
install -c -m 555 ${LIBSMALLOC} $(LIBDIR)
malloc-2.5.3b.o: malloc-2.5.3b.c
malloc-2.5.3b.so: malloc-2.5.3b.c
$(OBJS): $(SRCS)
$(SOBJS): $(SRCS)

View File

@ -1,52 +1,30 @@
*** malloc-2.5.3b.c.orig Sun Mar 26 10:50:54 1995
--- malloc-2.5.3b.c Fri Apr 7 19:21:29 1995
***************
*** 271,276 ****
--- 271,278 ----
/* preliminaries */
+ #include <sys/param.h>
+
#ifndef __STD_C
#ifdef __STDC__
#define __STD_C 1
***************
*** 1365,1373 ****
}
-
/* Derivatives */
#if __STD_C
Void_t* valloc(size_t bytes)
#else
--- 1367,1375 ----
}
/* Derivatives */
+ #if 0
#if __STD_C
Void_t* valloc(size_t bytes)
#else
***************
*** 1394,1400 ****
while (sz-- > 0) *q++ = 0;
return p;
}
!
#if __STD_C
void cfree(Void_t *mem)
#else
--- 1396,1402 ----
while (sz-- > 0) *q++ = 0;
return p;
}
! #endif
#if __STD_C
void cfree(Void_t *mem)
#else
--- malloc-2.6.4.c.orig Thu Nov 28 06:07:12 1996
+++ malloc-2.6.4.c Sun Apr 20 17:25:42 1997
@@ -216,6 +216,8 @@
/* 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
-# if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
+# if (defined(BSD) && (BSD < 199306)) || defined(DGUX) || defined(HAVE_GETPAGESIZE)
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

View File

@ -0,0 +1,2 @@
Please see http://g.oswego.edu/dl/html/malloc.html or the distribution file
(malloc-<ver>.c) for documenation on the use of Doug Lea's malloc library.