From owner-p4-projects@FreeBSD.ORG  Thu Apr 13 22:13:55 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 D38B916A409; Thu, 13 Apr 2006 22:13:54 +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 AD7AF16A400
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 22:13:54 +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 2EA1143D68
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 22:13:54 +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 k3DMDrXh066921
	for <perforce@freebsd.org>; Thu, 13 Apr 2006 22:13:54 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3DMDrrn066915
	for perforce@freebsd.org; Thu, 13 Apr 2006 22:13:53 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 13 Apr 2006 22:13:53 GMT
Message-Id: <200604132213.k3DMDrrn066915@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 95185 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, 13 Apr 2006 22:13:55 -0000

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

Change 95185 by jb@jb_freebsd2 on 2006/04/13 22:12:56

	Add libdwarf, conditional on building CDDL code which it depends
	on.

Affected files ...

.. //depot/projects/dtrace/src/gnu/lib/Makefile#2 edit

Differences ...

==== //depot/projects/dtrace/src/gnu/lib/Makefile#2 (text+ko) ====

@@ -18,4 +18,11 @@
 SUBDIR+= libg2c
 .endif
 
+# libdwarf is LGPL'd, but requires Sun's libelf which is CDDL'd,
+# so we can only build libdwarf if we are building the CDDL code
+# too.
+.if !defined(NO_CDDL) && !defined(NO_DTRACE)
+SUBDIR+= libdwarf
+.endif
+
 .include <bsd.subdir.mk>