Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Jul 2006 05:15:01 GMT
From:      John Birrell <jb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 101513 for review
Message-ID:  <200607140515.k6E5F1bD034485@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101513

Change 101513 by jb@jb_freebsd2 on 2006/07/14 05:14:34

	Allow for threads built into libc.

Affected files ...

.. //depot/projects/dtrace/src/sbin/ggate/ggatec/Makefile#3 edit
.. //depot/projects/dtrace/src/sbin/ggate/ggated/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace/src/sbin/ggate/ggatec/Makefile#3 (text+ko) ====

@@ -1,5 +1,7 @@
 # $FreeBSD: src/sbin/ggate/ggatec/Makefile,v 1.6 2005/07/10 21:10:20 pjd Exp $
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../shared
 
 PROG=	ggatec
@@ -9,7 +11,12 @@
 CFLAGS+= -DLIBGEOM
 CFLAGS+= -I${.CURDIR}/../shared
 
-DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} ${LIBPTHREAD}
-LDADD=	-lgeom -lsbuf -lbsdxml -lutil -lpthread
+DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
+LDADD=	-lgeom -lsbuf -lbsdxml -lutil
+
+.if ${MK_LIB_THREADS} == "no"
+DPADD+=	${LIBPTHREAD}
+LDADD+=	-lpthread
+.endif
 
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/sbin/ggate/ggated/Makefile#3 (text+ko) ====

@@ -1,13 +1,17 @@
 # $FreeBSD: src/sbin/ggate/ggated/Makefile,v 1.5 2005/07/10 21:10:20 pjd Exp $
 
+.include <bsd.own.mk>
+
 .PATH: ${.CURDIR}/../shared
 
 PROG=	ggated
 MAN=	ggated.8
 SRCS=	ggated.c ggate.c
 
+.if ${MK_LIB_THREADS} == "no"
 DPADD=	${LIBPTHREAD}
 LDADD=	-lpthread
+.endif
 
 CFLAGS+= -I${.CURDIR}/../shared
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607140515.k6E5F1bD034485>