From owner-p4-projects@FreeBSD.ORG  Thu Aug  3 20:43:21 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 06BEA16A4E5; Thu,  3 Aug 2006 20:43:21 +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 BDF4A16A4DE
	for <perforce@freebsd.org>; Thu,  3 Aug 2006 20:43:20 +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 2F51743D58
	for <perforce@freebsd.org>; Thu,  3 Aug 2006 20:43:20 +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 k73KhJTi068966
	for <perforce@freebsd.org>; Thu, 3 Aug 2006 20:43:19 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73KhJSL068963
	for perforce@freebsd.org; Thu, 3 Aug 2006 20:43:19 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 3 Aug 2006 20:43:19 GMT
Message-Id: <200608032043.k73KhJSL068963@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 103136 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: Thu, 03 Aug 2006 20:43:21 -0000

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

Change 103136 by jb@jb_freebsd2 on 2006/08/03 20:42:18

	Allow these apps to link if threads aren't built into libc.
	
	I still think that -lpthread is the wrong way to do this.

Affected files ...

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

Differences ...

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

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .include	"../../Makefile.inc"
 
 PROG=		ctfconvert
@@ -37,8 +39,6 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDFLAGS+=	-pthread
-
 LDADD+=		-lctf -ldwarf -lelf -lz
 
 .if ${MACHINE_ARCH} != "i386"
@@ -46,10 +46,14 @@
 LDADD+=		-lintl -liconv
 .endif
 
+.if ${MK_LIBC_THREADS} == "no"
+LDADD+= -lpthread
+.endif
+
 .PATH:		${.CURDIR}
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
-NO_MAN=
+MK_MAN=no
 
 .include <bsd.prog.mk>

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

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 .include	"../../Makefile.inc"
 
 PROG=		ctfmerge
@@ -34,8 +36,6 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDFLAGS+=	-pthread
-
 LDADD+=		-lctf -ldwarf -lelf -lz
 
 .if ${MACHINE_ARCH} != "i386"
@@ -43,10 +43,14 @@
 LDADD+=		-lintl -liconv
 .endif
 
+.if ${MK_LIBC_THREADS} == "no"
+LDADD+= -lpthread
+.endif
+
 .PATH:		${.CURDIR}/../ctfconvert
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
-NO_MAN=
+MK_MAN=no
 
 .include <bsd.prog.mk>