Use pthread buildlink instead of hard-coding -lpthread.

NetBSD · Dec 28, 2005 · 394b727 · 394b727
1 parent cefc5e4
commit 394b727
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/benchmarks/zelibm/Makefile b/benchmarks/zelibm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/27 17:06:53 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/28 13:19:26 joerg Exp $
 #
 
 DISTNAME=		zelibm
@@ -18,4 +18,5 @@ do-install:
 .include "../../mk/x11.buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/zelibm/distinfo b/benchmarks/zelibm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/10/20 17:35:39 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/12/28 13:19:26 joerg Exp $
 
 SHA1 (zelibm.tar.gz) = 2fc4366ed466d766042b59c1ce303a1b53f722d3
 RMD160 (zelibm.tar.gz) = 5c070996216f2a91f4c0b496662210d44b0ac517
@@ -7,4 +7,4 @@ SHA1 (patch-aa) = 117b5146284ff0becd918a2a81cc33ca0c1b6a93
 SHA1 (patch-ab) = 066bfcb106c946fd706d221d5e5b8dd8e9c9ece8
 SHA1 (patch-ac) = d7384d0c8878536057024253b281e9dd77936ea5
 SHA1 (patch-ad) = 24cc1d6d60a283d1f3922fb1b5223f4f01caacf5
-SHA1 (patch-ae) = 2ab8860c538040c040540529b5d2101c42b7b1eb
+SHA1 (patch-ae) = 0043a7c313b2b24b9168dd4463f88df933b0c6c5
diff --git a/benchmarks/zelibm/patches/patch-ae b/benchmarks/zelibm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/07/27 17:06:53 drochner Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/28 13:19:26 joerg Exp $
 
---- Makefile.orig	1998-11-30 03:37:23.000000000 +0100
-+++ Makefile	2004-04-16 22:14:53.000000000 +0200
-@@ -3,9 +3,9 @@
+--- Makefile.orig	1998-11-30 02:37:23.000000000 +0000
++++ Makefile
+@@ -3,9 +3,9 @@ LIB-routines = dbl2mpq.c zeexp.c zeexp_d
  	       zecos.c zecos_d.c zesinh.c zesinh_d.c zecosh.c zecosh_d.c \
  	       zesqrt.c zesqrt_d.c zetan.c zetan_d.c zetanh.c zetanh_d.c
 
@@ -15,3 +15,12 @@ $NetBSD: patch-ae,v 1.1.1.1 2005/07/27 17:06:53 drochner Exp $
 
  COMPILE = $(CC) -c -o $@ $(CFLAGS) $(INCLUDES) $<
 
+@@ -18,7 +18,7 @@ $(PROGS): %: %.o $(LIB)
+ 	$(CC) $(LDFLAGS) -o $@ $^ -lgmp
+
+ libmtest: libmtest.o testx.o Plot.o Progress.o image.o $(LIB)
+-	$(CC) $(LDFLAGS) -o $@ $^ -lgd -lpthread -lgmp -lXaw -lSM -lICE -lXt -lX11 -lXext -lm
++	$(CC) $(LDFLAGS) -o $@ $^ -lgd -lgmp -lXaw -lSM -lICE -lXt -lX11 -lXext -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+
+ libzem.a: $(LIB-routines:.c=.o)
+ 	$(AR) rcs $@ $^