From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 05:21:10 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 8783116A4E1; Fri, 14 Jul 2006 05:21:10 +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 4A1E716A4DA
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:21:10 +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 05A5943D49
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:21:10 +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 k6E5L9k2034978
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 05:21:09 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6E5L9G8034975
	for perforce@freebsd.org; Fri, 14 Jul 2006 05:21:09 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 14 Jul 2006 05:21:09 GMT
Message-Id: <200607140521.k6E5L9G8034975@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 101515 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:21:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=101515

Change 101515 by jb@jb_freebsd2 on 2006/07/14 05:20:11

	Allow for threads built into libc.

Affected files ...

.. //depot/projects/dtrace/src/usr.sbin/cached/Makefile#2 edit
.. //depot/projects/dtrace/src/usr.sbin/pppctl/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace/src/usr.sbin/cached/Makefile#2 (text) ====

@@ -1,5 +1,7 @@
 # $FreeBSD: src/usr.sbin/cached/Makefile,v 1.1 2006/04/28 12:03:37 ume Exp $
 
+.include <bsd.own.mk>
+
 PROG=cached
 PROGNAME=cached
 MAN=cached.conf.5 cached.8
@@ -9,8 +11,14 @@
 	config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \
 	parser.c
 CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\""
-DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL}
-LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL}
+DPADD+=${LIBM} ${LIBUTIL}
+LDADD+=${LIBM} ${LIBUTIL}
+
+.if ${MK_LIBC_THREADS} == "no"
+DPADD+=${LIBPTHREAD}
+LDADD+=${LIBPTHREAD}
+.endif
+
 LDFLAGS+= -Xlinker --export-dynamic
 
 .PATH:	${.CURDIR}/agents

==== //depot/projects/dtrace/src/usr.sbin/pppctl/Makefile#3 (text+ko) ====

@@ -1,9 +1,16 @@
 # $FreeBSD: src/usr.sbin/pppctl/Makefile,v 1.16 2004/01/31 17:28:09 marcel Exp $
 
+.include <bsd.own.mk>
+
 PROG=	pppctl
 MAN=	pppctl.8
 
-DPADD=	${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAP}
-LDADD=	-lpthread -ledit -ltermcap
+DPADD=	${LIBEDIT} ${LIBTERMCAP}
+LDADD=	-ledit -ltermcap
+
+.if ${MK_LIBC_THREADS} == "no"
+DPADD=	${LIBPTHREAD}
+LDADD=	-lpthread
+.endif
 
 .include <bsd.prog.mk>