1 files changed, 41 insertions, 46 deletions
diff --git a/devel/ptmalloc/files/patch-Makefile b/devel/ptmalloc/files/patch-Makefile
index 0db580441b50..9b1015c3ef4e 100644
--- a/devel/ptmalloc/files/patch-Makefile
+++ b/devel/ptmalloc/files/patch-Makefile
@@ -1,57 +1,52 @@
---- Makefile.orig	Mon Dec 20 21:58:38 1999
-+++ Makefile	Tue Dec 14 13:22:01 2004
-@@ -10,7 +10,7 @@
- 
- OPT_FLAGS  = -O #-g
- WARN_FLAGS = # -Wall
--SH_FLAGS   = -shared
-+SH_FLAGS   = -shared -fpic
- 
- # Flags for the test programs
- T_FLAGS   = -DUSE_MALLOC=1 -DMALLOC_HOOKS -DTEST=1
-@@ -27,6 +27,9 @@
- THR_FLAGS = -DUSE_PTHREADS=1 -DUSE_TSD_DATA_HACK -D_REENTRANT
+--- Makefile.orig	2006-06-05 06:13:57.000000000 -0500
++++ Makefile	2008-06-17 20:56:10.000000000 -0500
+@@ -15,12 +15,12 @@
+ TAR_FLAGS = --numeric-owner --exclude "*~" --exclude "debian/tmp*"
+ 
+ #CC = /pkg/gcc-2.95.2-wg/bin/gcc
+-CC = cc
++CC ?= cc
+ 
+ SYS_FLAGS  =
+-OPT_FLAGS  = -g -O # -O2
++OPT_FLAGS  = -O2 # -O2
+ WARN_FLAGS = #-Wall -Wstrict-prototypes
+-SH_FLAGS   = -shared -fpic
++SH_FLAGS   = -shared -fPIC
+ 
+ INC_FLAGS  = -Isysdeps/generic
+ 
+@@ -35,6 +35,9 @@
+ THR_FLAGS = -DUSE_TSD_DATA_HACK -D_REENTRANT
  THR_LIBS  = -lpthread
  
 +# Target libraries
-+LIBS=		libptmalloc.a ptmalloc.so
++LIBS=	libmalloc.a malloc.so
 +
  RM        = rm -f
+ AR        = ar
+ RANLIB    = ranlib
+@@ -46,12 +49,12 @@
+ TESTS = t-test1$(T_SUF) t-test2$(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)
  
- # Don't need it for the Linux C library 6, see `glibc' target below.
-@@ -40,7 +43,9 @@
  .c.o:
  	$(CC) -c $(CFLAGS) $<
  
--all: $(TESTS)
-+all: ${LIBS} 
-+
-+tests: $(TESTS)
- 
- shared: ptmalloc.so
+-all: $(LIB_MALLOC) $(TESTS)
++all: $(LIBS) $(TESTS)
  
-@@ -48,14 +53,14 @@
+ malloc.o: malloc.c malloc.h
  	$(CC) -c $(CFLAGS) $(M_FLAGS) $<
- 
- ptmalloc.so: ptmalloc.c ptmalloc.h thread-m.h
--	$(CC) $(SH_FLAGS) $(CFLAGS) $(M_FLAGS) $< -o $@
-+	$(CC) $(SH_FLAGS) $(CFLAGS) $(M_FLAGS) ptmalloc.c -o $@
- 
- again:
- 	$(RM) $(TESTS)
- 	$(MAKE) $(TESTS)
- 
- clean:
--	$(RM) ptmalloc.o ptmalloc.so $(TESTS) core
-+	$(RM) ptmalloc.o ptmalloc.so $(TESTS) core lib*
- 
- t-test1$(T_SUF): t-test1.c t-test.h thread-m.h $(MALLOC)
- 	$(CC) $(CFLAGS) $(T_FLAGS) t-test1.c $(MALLOC) $(THR_LIBS) -o $@
-@@ -129,3 +134,7 @@
- dist:
- 	cd ..; tar cf - $(DIST_FILES2:%=ptmalloc/%) | \
- 	 gzip -9 >ptmalloc.tar.gz
-+
-+libptmalloc.a: ptmalloc.o
-+	ar qcvf $@ ptmalloc.o
-+	ranlib $@
+@@ -102,7 +105,7 @@
+ posix:
+ 	$(MAKE) THR_FLAGS='-DUSE_TSD_DATA_HACK -D_REENTRANT' \
+  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
+ 
+ # posix threads with explicit initialization.  Known to be needed on HPUX.