From owner-p4-projects@FreeBSD.ORG  Sat Nov  4 02:12:16 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 3FC9616A412; Sat,  4 Nov 2006 02:12:16 +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 1B06316A403
	for <perforce@freebsd.org>; Sat,  4 Nov 2006 02:12:16 +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 DC86343D55
	for <perforce@freebsd.org>; Sat,  4 Nov 2006 02:12:15 +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 kA42CFXX060130
	for <perforce@freebsd.org>; Sat, 4 Nov 2006 02:12:15 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA42CFXV060127
	for perforce@freebsd.org; Sat, 4 Nov 2006 02:12:15 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 4 Nov 2006 02:12:15 GMT
Message-Id: <200611040212.kA42CFXV060127@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 109197 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: Sat, 04 Nov 2006 02:12:16 -0000

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

Change 109197 by jb@jb_freebsd8 on 2006/11/04 02:11:20

	Remove references to my experimental threads-in-libc.

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#11 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#8 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#11 (text+ko) ====

@@ -41,16 +41,12 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=		-lctf -ldwarf -lelf -lz
-
-.if ${MK_LIBC_THREADS} == "no"
-LDADD+= -lpthread
-.endif
+LDADD+=		-lctf -ldwarf -lelf -lz -lpthread
 
 .PATH:		${.CURDIR}
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
-MK_MAN=no
+MK_MAN=		no
 
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#8 (text+ko) ====

@@ -38,16 +38,12 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=		-lctf -ldwarf -lelf -lz
-
-.if ${MK_LIBC_THREADS} == "no"
-LDADD+= -lpthread
-.endif
+LDADD+=		-lctf -ldwarf -lelf -lz -lpthread
 
 .PATH:		${.CURDIR}/../ctfconvert
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
-MK_MAN=no
+MK_MAN=		no
 
 .include <bsd.prog.mk>