From owner-p4-projects@FreeBSD.ORG  Thu Oct 18 04:43:43 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 84A9016A420; Thu, 18 Oct 2007 04:43:43 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 38ECA16A419
	for <perforce@freebsd.org>; Thu, 18 Oct 2007 04:43:43 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2633C13C465
	for <perforce@freebsd.org>; Thu, 18 Oct 2007 04:43:43 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9I4hhfc094619
	for <perforce@freebsd.org>; Thu, 18 Oct 2007 04:43:43 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9I4hhYQ094616
	for perforce@freebsd.org; Thu, 18 Oct 2007 04:43:43 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 18 Oct 2007 04:43:43 GMT
Message-Id: <200710180443.l9I4hhYQ094616@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 127656 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, 18 Oct 2007 04:43:43 -0000

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

Change 127656 by jb@jb_freebsd1 on 2007/10/18 04:43:18

	Replace references to the GNU libdwarf with the BSD one.
	
	Pass VERSION to the lib32 part of the buildworld so that
	the CTF tools can use it in there too.

Affected files ...

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

Differences ...

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

@@ -260,6 +260,7 @@
 # Yes, the flags are redundant.
 LIB32WMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
+		VERSION="${VERSION}" \
 		MACHINE=i386 \
 		MACHINE_ARCH=i386 \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -893,8 +894,8 @@
 .endif
 
 .if ${MK_CDDL} != "no"
-_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf \
-    lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
+_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
+    lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
 bootstrap-tools:
@@ -1054,7 +1055,7 @@
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
-		${_secure_lib_libssl} gnu/lib/libdwarf
+		${_secure_lib_libssl} lib/libdwarf
 
 .if ${MK_LIBTHR} != "no" && ${MK_LIBKSE} != "no"
 _default_thread_lib=	lib/${DEFAULT_THREAD_LIB}