From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 05:15:22 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1BCF016A52E; Fri, 14 Jul 2006 05:15:22 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C66B816A504
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:15:21 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 454C043D4C
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:15:01 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6E5F1A0034488
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:15:01 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6E5F1bD034485
	for perforce@freebsd.org; Fri, 14 Jul 2006 05:15:01 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Jul 2006 05:15:01 GMT
Message-Id: <200607140515.k6E5F1bD034485@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101513 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jul 2006 05:15:22 -0000

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