From owner-p4-projects@FreeBSD.ORG  Wed Apr 12 07:45:45 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 6CC7D16A404; Wed, 12 Apr 2006 07:45:45 +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 3F00416A401
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 07:45:45 +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 0A0D843D45
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 07:45:45 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3C7ji0Q028207
	for <perforce@freebsd.org>; Wed, 12 Apr 2006 07:45:44 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3C7jipR028204
	for perforce@freebsd.org; Wed, 12 Apr 2006 07:45:44 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 12 Apr 2006 07:45:44 GMT
Message-Id: <200604120745.k3C7jipR028204@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 95056 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: Wed, 12 Apr 2006 07:45:45 -0000

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

Change 95056 by jb@jb_freebsd2 on 2006/04/12 07:45:36

	Add sgsmsg as a bootstrap-tool iff !NO_CDDL and !NO_DTRACE.
	
	NO_CDDL is intended to allow buildworld without and CDDL code.
	
	NO_DTRACE is intended to stop buildworld from building files with
	CTF (C Type Format) data which is half way between a stripped
	binary and one with debug symbols. The CTF data is needed by DTrace.

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#3 edit

Differences ...

==== //depot/projects/dtrace/src/Makefile.inc1#3 (text+ko) ====

@@ -825,8 +825,13 @@
 _pwd_mkdb=	usr.sbin/pwd_mkdb
 .endif
 
+.if !defined(NO_CDDL) && !defined(NO_DTRACE)
+_sgsmsg=	cddl/usr.bin/sgsmsg
+.endif
+
 bootstrap-tools:
 .for _tool in \
+    ${_sgsmsg} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
@@ -870,6 +875,10 @@
 _rescue= rescue/rescue
 .endif
 
+.if !defined(NO_CDDL) && !defined(NO_DTRACE)
+_dtrace_tools= cddl/usr.bin
+.endif
+
 build-tools:
 .for _tool in \
     bin/csh \
@@ -888,6 +897,7 @@
 .endfor
 .for _tool in \
     gnu/usr.bin/cc/cc_tools \
+    ${_dtrace_tools} \
     ${_kerberos5_tools}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
 		cd ${.CURDIR}/${_tool}; \
@@ -1011,6 +1021,10 @@
 _prebuild_libs+=	lib/libypclnt
 .endif
 
+.if !defined(NO_CDDL) && !defined(NO_DTRACE)
+_prebuild_libs+=	cddl/lib
+.endif
+
 _generic_libs+=	usr.bin/lex/lib
 
 .if ${MACHINE} == "i386"