Attachment #222452 for bug #252124




# $FreeBSD: head/devel/dmalloc/Makefile 513602 2019-10-02 18:49:27Z antoine $

PORTNAME=	dmalloc
DISTVERSION=	5.6.5
PORTREVISION=	1
CATEGORIES=	devel
# Version 5.5.2 is only available at this URL
MASTER_SITES=	http://dmalloc.com/releases/
EXTRACT_SUFX=	.tgz

MAINTAINER=	mjl@luckie.org.nz
COMMENT=	Portable debug memory allocation library

LICENSE=	ISCL
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-threads --enable-shlib
GNU_CONFIGURE_PREFIX=	"${STAGEDIR}${PREFIX}"
CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL_DATA}"
CFLAGS+=	-fPIC
USES=		tar:tgz
USE_LDCONFIG=	yes
MAKE_JOBS_UNSAFE=	yes


DOCS_INSTALL_TARGET=	installdocs

post-install:
	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/dmalloc
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmalloc
	@(cd ${STAGEDIR}${PREFIX}/lib; \
		${CHMOD} 644 libdmalloc.so.1; \
		${STRIP_CMD} libdmalloc.so.1; \
		${LN} -sf libdmalloc.so.1 libdmalloc.so; \
		${CHMOD} 644 libdmallocxx.so.1; \
		${STRIP_CMD} libdmallocxx.so.1; \
		${LN} -sf libdmallocxx.so.1 libdmallocxx.so; \
		${CHMOD} 644 libdmallocth.so.1; \
		${STRIP_CMD} libdmallocth.so.1; \
		${LN} -sf libdmallocth.so.1 libdmallocth.so; \
		${CHMOD} 644 libdmallocthcxx.so.1; \
		${STRIP_CMD} libdmallocthcxx.so.1; \
		${LN} -sf libdmallocthcxx.so.1 libdmallocthcxx.so)


Lines 1-2 Link Here

(-)dmalloc-new/distinfo (-2 / +3 lines)
1	SHA256 (dmalloc-5.5.2.tgz) = d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a	1	TIMESTAMP = 1613355201
2	SIZE (dmalloc-5.5.2.tgz) = 666608	2	SHA256 (dmalloc-5.6.5.tgz) = 480e3414ab6cedca837721c756b7d64b01a84d2d0e837378d98444e2f63a7c01
		3	SIZE (dmalloc-5.6.5.tgz) = 322310




--- Makefile.in.orig	2020-12-28 20:55:00 UTC
+++ Makefile.in
@@ -42,7 +42,7 @@ LIBRARY	= lib$(MODULE).a
 
 # thread version of the library
 LIB_TH	= lib$(MODULE)th.a

 @TH_ON@BUILD_ALL_1 = threads
 @TH_ON@INSTALL_LIB_1 = installth
 @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
@@ -52,7 +52,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@
 
 # C++ version of the library
 LIB_CXX	= lib$(MODULE)xx.a

 @CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
 @CXX_ON@INSTALL_LIB_3 = installcxx
 @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
@@ -62,7 +62,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
 
 # threads + C++
 LIB_TH_CXX = lib$(MODULE)thcxx.a

 @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
 @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
 @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
@@ -77,7 +77,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
 @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
 
 # shared versions of the libraries

 @SL_ON@BUILD_ALL_7 = $(LIB_SL)
 @SL_ON@INSTALL_LIB_7 = installsl
 @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
@@ -226,7 +226,6 @@ installsl : $(LIB_SL)
 installlib : $(INSTALL_LIB)
 	$(srcdir)/mkinstalldirs $(libdir)
 	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)

 @SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
 @CXX_OFF@	@echo "Enter 'make installcxx' to install the C++ library"
 @TH_OFF@	@echo "Enter 'make installth' to install thread library"
@@ -259,13 +258,13 @@ dmalloc.h : $(srcdir)/dmalloc.h.1 dmalloc.h.2 $(srcdir
 # via: http://256.com/gray/email.html
 $(LIB_SL) : $(LIBRARY)
 	rm -f $@ $@.t
-	@shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
+	@shlinkargs@ $(LIBRARY)
 	mv $@.t $@
 
 $(INFO_FILE) : $(srcdir)/$(TEXI_FILE)
@@ -270,7 +269,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)
 
 $(LIB_TH_SL) : $(LIB_TH)
 	rm -f $@ $@.t
-	makeinfo -o $@.t --fill-column=100 --no-split $<
+	makeinfo -o $@.t --fill-column=100 --no-split $(srcdir)/$(TEXI_FILE)
 	mv $@.t $@
 
 # we need the FILE2 this because make gets confused by ../dmalloc.html
 $(HTML_FILE) $(HTML_FILE2) : $(srcdir)/$(TEXI_FILE)
 
 $(LIB_CXX_SL) : $(LIB_CXX)
 	rm -f $@ $@.t
-	texi2html --output=$@.t -number -monolithic $<
+	texi2html --output=$@.t $(srcdir)/$(TEXI_FILE)
 	mv $@.t $@
 
 # we need the FILE2 this because make gets confused by ../INSTALL.txt
@@ -353,8 +352,7 @@ utils : $(UTIL)
 
 $(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o append.o
 	rm -f $@ $@.t
-	@shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
+	@shlinkargs@ $(LIB_TH_CXX)
 	mv $@.t $@
 
 threadssl : $(LIB_TH_SL)
@@ -311,9 +310,8 @@ utils : $(UTIL)
 
 $(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o
 	rm -f $@
-	$(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
+	$(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o \
 		$(LIBS)
-	mv $(A_OUT) $@
+	$(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
 
 # special _th versions of objects with the LOCK_THREADS variable defined to 1
 chunk_th.o : $(srcdir)/chunk.c
@@ -373,13 +371,11 @@ tests : $(TEST) $(TEST_FC)
 
 $(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)
 	rm -f $@

-	mv $(A_OUT) $@
+	$(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
 
 check : $(TEST) $(TEST_FC)
 	./$(TEST_FC) -s

Lines 1-11 Link Here

(-)dmalloc-new/files/patch-configure (-5 / +5 lines)
1	--- configure 2007-07-06 20:01:39.000000000 +0300	1	--- configure.orig 2020-12-28 20:55:00 UTC
2	+++ configure_new 2007-07-06 16:59:48.000000000 +0300	2	+++ configure
3	@@ -2643,7 +2643,7 @@	3	@@ -3500,7 +3500,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4		4
5		5
6	# see if we actually have a CXX program	6	# see if we actually have a CXX program
7	-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then	7	-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then
8	+if test "$CXX" = ""; then	8	+if test "$CXX" = ""; then
9	{ echo "$as_me:$LINENO: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5	9	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&5
10	echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;}	10	$as_echo "$as_me: WARNING: could not find C++ compiler $ac_cv_prog_CXX" >&2;}
11	enable_cxx=no	11	enable_cxx=no

Line 0 Link Here

(-)dmalloc-new/files/patch-settings.dist (+11 lines)
	1	--- settings.dist.orig 2020-12-28 20:55:00 UTC
	2	+++ settings.dist
	3	@@ -76,7 +76,7 @@
	4	* generate an exception when it sees a free(0L).
	5	*/
	6	#define ALLOW_FREE_NULL 1
	7	-#define ALLOW_FREE_NULL_MESSAGE 1
	8	+#define ALLOW_FREE_NULL_MESSAGE 0
	9
	10	/*
	11	* Should we use the ra-address macros in return.h. These are system

Lines 1-4 Link Here

(-)dmalloc-new/pkg-plist (-3 / +3 lines)
1	bin/dmalloc	1	@(,,755) bin/dmalloc
2	include/dmalloc.h	2	include/dmalloc.h
3	lib/libdmalloc.a	3	lib/libdmalloc.a
4	lib/libdmalloc.so	4	lib/libdmalloc.so
Lines 13-17 Link Here
13	lib/libdmallocxx.so	13	lib/libdmallocxx.so
14	lib/libdmallocxx.so.1	14	lib/libdmallocxx.so.1
15	%%PORTDOCS%%%%DOCSDIR%%/dmalloc.html	15	%%PORTDOCS%%%%DOCSDIR%%/dmalloc.html
16	%%PORTDOCS%%%%DOCSDIR%%/dmalloc.pdf	16	%%PORTDOCS%%%%DOCSDIR%%/dmalloc.info
17	%%PORTDOCS%%%%DOCSDIR%%/dmalloc.texi	17	%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt

Return to bug 252124

Lines 2-22 Link Here

(-)dmalloc-new/Makefile (-10 / +6 lines)
2	# $FreeBSD: head/devel/dmalloc/Makefile 513602 2019-10-02 18:49:27Z antoine $	2	# $FreeBSD: head/devel/dmalloc/Makefile 513602 2019-10-02 18:49:27Z antoine $
3		3
4	PORTNAME= dmalloc	4	PORTNAME= dmalloc
5	PORTVERSION= 5.5.2	5	DISTVERSION= 5.6.5
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	# Version 5.5.2 is only available at this URL
9	MASTER_SITES= http://dmalloc.com/releases/	7	MASTER_SITES= http://dmalloc.com/releases/
10	EXTRACT_SUFX= .tgz
11		8
12	MAINTAINER= mjl@luckie.org.nz	9	MAINTAINER= mjl@luckie.org.nz
13	COMMENT= Portable debug memory allocation library	10	COMMENT= Portable debug memory allocation library
14		11
		12	LICENSE= ISCL
		13	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
		14
15	GNU_CONFIGURE= yes	15	GNU_CONFIGURE= yes
16	CONFIGURE_ARGS= --enable-threads --enable-shlib	16	CONFIGURE_ARGS= --enable-threads --enable-shlib
17	GNU_CONFIGURE_PREFIX= "${STAGEDIR}${PREFIX}"	17	GNU_CONFIGURE_PREFIX= "${STAGEDIR}${PREFIX}"
18	CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_DATA}"	18	CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_DATA}"
19	CFLAGS= -fPIC	19	CFLAGS+= -fPIC
		20	USES= tar:tgz
20	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
21	MAKE_JOBS_UNSAFE= yes	22	MAKE_JOBS_UNSAFE= yes
22		23
Lines 28-46 Link Here
28	DOCS_INSTALL_TARGET= installdocs	29	DOCS_INSTALL_TARGET= installdocs
29		30
30	post-install:	31	post-install:
31	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/dmalloc
32	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmalloc	32	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/dmalloc
33	@(cd ${STAGEDIR}${PREFIX}/lib; \	33	@(cd ${STAGEDIR}${PREFIX}/lib; \
34	${CHMOD} 644 libdmalloc.so.1; \
35	${STRIP_CMD} libdmalloc.so.1; \	34	${STRIP_CMD} libdmalloc.so.1; \
36	${LN} -sf libdmalloc.so.1 libdmalloc.so; \	35	${LN} -sf libdmalloc.so.1 libdmalloc.so; \
37	${CHMOD} 644 libdmallocxx.so.1; \
38	${STRIP_CMD} libdmallocxx.so.1; \	36	${STRIP_CMD} libdmallocxx.so.1; \
39	${LN} -sf libdmallocxx.so.1 libdmallocxx.so; \	37	${LN} -sf libdmallocxx.so.1 libdmallocxx.so; \
40	${CHMOD} 644 libdmallocth.so.1; \
41	${STRIP_CMD} libdmallocth.so.1; \	38	${STRIP_CMD} libdmallocth.so.1; \
42	${LN} -sf libdmallocth.so.1 libdmallocth.so; \	39	${LN} -sf libdmallocth.so.1 libdmallocth.so; \
43	${CHMOD} 644 libdmallocthcxx.so.1; \
44	${STRIP_CMD} libdmallocthcxx.so.1; \	40	${STRIP_CMD} libdmallocthcxx.so.1; \
45	${LN} -sf libdmallocthcxx.so.1 libdmallocthcxx.so)	41	${LN} -sf libdmallocthcxx.so.1 libdmallocthcxx.so)
46		42

Lines 1-6 Link Here

(-)dmalloc-new/files/patch-Makefile.in (-43 / +22 lines)
1	--- Makefile.in.orig 2007-05-14 10:26:14.000000000 -0700	1	--- Makefile.in.orig 2020-12-28 20:55:00 UTC
2	+++ Makefile.in 2019-06-11 15:24:34.190572000 -0700	2	+++ Makefile.in
3	@@ -41,7 +41,7 @@ LIBRARY = lib$(MODULE).a	3	@@ -42,7 +42,7 @@ LIBRARY = lib$(MODULE).a
4		4
5	# thread version of the library	5	# thread version of the library
6	LIB_TH = lib$(MODULE)th.a	6	LIB_TH = lib$(MODULE)th.a
Lines 9-15 Link Here
9	@TH_ON@BUILD_ALL_1 = threads	9	@TH_ON@BUILD_ALL_1 = threads
10	@TH_ON@INSTALL_LIB_1 = installth	10	@TH_ON@INSTALL_LIB_1 = installth
11	@SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)	11	@SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
12	@@ -51,7 +51,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@	12	@@ -52,7 +52,7 @@ LIB_TH_SL = lib$(MODULE)th.@shlibext@
13		13
14	# C++ version of the library	14	# C++ version of the library
15	LIB_CXX = lib$(MODULE)xx.a	15	LIB_CXX = lib$(MODULE)xx.a
Lines 18-24 Link Here
18	@CXX_ON@BUILD_ALL_3 = $(LIB_CXX)	18	@CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
19	@CXX_ON@INSTALL_LIB_3 = installcxx	19	@CXX_ON@INSTALL_LIB_3 = installcxx
20	@SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)	20	@SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
21	@@ -61,7 +61,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@	21	@@ -62,7 +62,7 @@ LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
22		22
23	# threads + C++	23	# threads + C++
24	LIB_TH_CXX = lib$(MODULE)thcxx.a	24	LIB_TH_CXX = lib$(MODULE)thcxx.a
Lines 27-33 Link Here
27	@TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)	27	@TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
28	@TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx	28	@TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
29	@TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)	29	@TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
30	@@ -76,7 +76,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@	30	@@ -77,7 +77,7 @@ LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
31	@CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl	31	@CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
32		32
33	# shared versions of the libraries	33	# shared versions of the libraries
Lines 36-42 Link Here
36	@SL_ON@BUILD_ALL_7 = $(LIB_SL)	36	@SL_ON@BUILD_ALL_7 = $(LIB_SL)
37	@SL_ON@INSTALL_LIB_7 = installsl	37	@SL_ON@INSTALL_LIB_7 = installsl
38	@SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)	38	@SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
39	@@ -218,7 +218,6 @@ installsl : $(LIB_SL)	39	@@ -226,7 +226,6 @@ installsl : $(LIB_SL)
40	installlib : $(INSTALL_LIB)	40	installlib : $(INSTALL_LIB)
41	$(srcdir)/mkinstalldirs $(libdir)	41	$(srcdir)/mkinstalldirs $(libdir)
42	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)	42	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
Lines 44-97 Link Here
44	@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"	44	@SL_OFF@ @echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
45	@CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library"	45	@CXX_OFF@ @echo "Enter 'make installcxx' to install the C++ library"
46	@TH_OFF@ @echo "Enter 'make installth' to install thread library"	46	@TH_OFF@ @echo "Enter 'make installth' to install thread library"
47	@@ -257,7 +256,7 @@ shlib : $(BUILD_SL)	47	@@ -259,13 +258,13 @@ dmalloc.h : $(srcdir)/dmalloc.h.1 dmalloc.h.2 $(srcdir
48	# via: http://256.com/gray/email.html
49	$(LIB_SL) : $(LIBRARY)
50	rm -f $@ $@.t
51	- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
52	+ @shlinkargs@ $(LIBRARY)
53	mv $@.t $@
54		48
55	$(LIBRARY) : $(OBJS) $(NORMAL_OBJS)	49	$(INFO_FILE) : $(srcdir)/$(TEXI_FILE)
56	@@ -270,7 +269,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS)
57
58	$(LIB_TH_SL) : $(LIB_TH)
59	rm -f $@ $@.t	50	rm -f $@ $@.t
60	- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)	51	- makeinfo -o $@.t --fill-column=100 --no-split $<
61	+ @shlinkargs@ $(LIB_TH)	52	+ makeinfo -o $@.t --fill-column=100 --no-split $(srcdir)/$(TEXI_FILE)
62	mv $@.t $@	53	mv $@.t $@
63		54
64	$(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)	55	# we need the FILE2 this because make gets confused by ../dmalloc.html
65	@@ -279,7 +278,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)	56	$(HTML_FILE) $(HTML_FILE2) : $(srcdir)/$(TEXI_FILE)
66
67	$(LIB_CXX_SL) : $(LIB_CXX)
68	rm -f $@ $@.t	57	rm -f $@ $@.t
69	- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)	58	- texi2html --output=$@.t -number -monolithic $<
70	+ @shlinkargs@ $(LIB_CXX)	59	+ texi2html --output=$@.t $(srcdir)/$(TEXI_FILE)
71	mv $@.t $@	60	mv $@.t $@
72		61
73	$(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)	62	# we need the FILE2 this because make gets confused by ../INSTALL.txt
74	@@ -288,7 +287,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)	63	@@ -353,8 +352,7 @@ utils : $(UTIL)
75		64
76	$(LIB_TH_CXX_SL) : $(LIB_TH_CXX)	65	$(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o append.o
77	rm -f $@ $@.t
78	- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
79	+ @shlinkargs@ $(LIB_TH_CXX)
80	mv $@.t $@
81
82	threadssl : $(LIB_TH_SL)
83	@@ -311,9 +310,8 @@ utils : $(UTIL)
84
85	$(UTIL) : $(UTIL).o dmalloc_argv.o compat.o env.o
86	rm -f $@	66	rm -f $@
87	- $(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o \	67	- $(CC) $(LDFLAGS) -o $(A_OUT) $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
88	+ $(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o \
89	$(LIBS)
90	- mv $(A_OUT) $@	68	- mv $(A_OUT) $@
		69	+ $(CC) $(LDFLAGS) -o $@ $(UTIL).o dmalloc_argv.o compat.o env.o append.o $(LIBS)
91		70
92	# special _th versions of objects with the LOCK_THREADS variable defined to 1	71	# special _th versions of objects with the LOCK_THREADS variable defined to 1
93	chunk_th.o : $(srcdir)/chunk.c	72	chunk_th.o : $(srcdir)/chunk.c
94	@@ -335,13 +333,11 @@ tests : $(TEST) $(TEST_FC)	73	@@ -373,13 +371,11 @@ tests : $(TEST) $(TEST_FC)
95		74
96	$(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)	75	$(TEST) : $(TEST).o dmalloc_argv.o $(LIBRARY)
97	rm -f $@	76	rm -f $@
Lines 105-109 Link Here
105	- mv $(A_OUT) $@	84	- mv $(A_OUT) $@
106	+ $(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)	85	+ $(CC) $(LDFLAGS) -o $@ $(TEST_FC).o dmalloc_argv.o $(LIBRARY)
107		86
108	check light : $(TEST) $(TEST_FC)	87	check : $(TEST) $(TEST_FC)
109	./$(TEST_FC) -s	88	./$(TEST_FC) -s