From owner-p4-projects@FreeBSD.ORG  Wed Jul 12 08:52:34 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 2140316A4E6; Wed, 12 Jul 2006 08:52:34 +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 C170C16A4E1
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 08:52:33 +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 A53C243D68
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 08:52:29 +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 k6C8qT70006872
	for <perforce@freebsd.org>; Wed, 12 Jul 2006 08:52:29 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6C8qTqS006869
	for perforce@freebsd.org; Wed, 12 Jul 2006 08:52:29 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 12 Jul 2006 08:52:29 GMT
Message-Id: <200607120852.k6C8qTqS006869@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 101342 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 Jul 2006 08:52:34 -0000

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

Change 101342 by jb@jb_freebsd2 on 2006/07/12 08:51:33

	jkoshy is working on a BSD version of libelf, so remove the comment
	about libdwarf depending on Sun's libelf.
	
	The libdwarf being build here is the SGI version because that is
	more recent than the one that Sun is using and SGI has included
	more vendor-specific extensions.

Affected files ...

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

Differences ...

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

@@ -2,7 +2,7 @@
 
 .include <bsd.own.mk>
 
-SUBDIR= csu libgcc libgcov libdialog libregex libreadline
+SUBDIR= csu libgcc libgcov libdialog libdwarf libregex libreadline
 
 # libsupc++ uses libstdc++ headers, although 'make includes' should
 # have taken care of that already.
@@ -18,11 +18,4 @@
 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>