From owner-p4-projects@FreeBSD.ORG  Tue Apr 18 06:04:03 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 4F43E16A404; Tue, 18 Apr 2006 06:04:03 +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 2E35416A402
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 06:04:03 +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 EF8A643D46
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 06:04:02 +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 k3I642Dj082648
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 06:04:02 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3I642oS082645
	for perforce@freebsd.org; Tue, 18 Apr 2006 06:04:02 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 18 Apr 2006 06:04:02 GMT
Message-Id: <200604180604.k3I642oS082645@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 95481 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: Tue, 18 Apr 2006 06:04:03 -0000

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

Change 95481 by jb@jb_freebsd2 on 2006/04/18 06:03:07

	Add the ctfmerge statements to merge CTF data into shared libraries.
	
	This is a significant emotional event! There are enough programs and
	shared libraries built automatically in 'make buildworld' to do a
	trace, if only there was something to actually /do/ the trace. That
	means it's time to get dtrace(1) working. And beyond that, the
	dtrace kernel device.

Affected files ...

.. //depot/projects/dtrace/src/share/mk/bsd.lib.mk#4 edit

Differences ...

==== //depot/projects/dtrace/src/share/mk/bsd.lib.mk#4 (text+ko) ====

@@ -222,6 +222,9 @@
 	@${CC} ${LDFLAGS} -shared -Wl,-x \
 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
 	    `lorder ${SOBJS} | tsort -q` ${LDADD}
+.if defined(CTFMERGE)
+	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+.endif
 .endif
 
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"