From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 21:36:23 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 9BBA316A556; Tue, 15 Aug 2006 21:36:23 +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 5A20216A543
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 21:36:23 +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 5C80A43DEF
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 21:34:56 +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 k7FLYuOw067236
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 21:34:56 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLYuTq067233
	for perforce@freebsd.org; Tue, 15 Aug 2006 21:34:56 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 15 Aug 2006 21:34:56 GMT
Message-Id: <200608152134.k7FLYuTq067233@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 104135 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, 15 Aug 2006 21:36:23 -0000

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

Change 104135 by jb@jb_freebsd2 on 2006/08/15 21:33:59

	Use FreeBSD's libelf now.
	
	Also ignore those Solaris #pragma ident statements that I am so
	fond of.

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#6 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#6 (text+ko) ====

@@ -8,7 +8,7 @@
 
 SRCS=		dtrace.c
 
-WARNS?=		1
+WARNS=		1
 
 CFLAGS+=	-I${.CURDIR}/../../../contrib \
 		-I${.CURDIR}/../../../sys/contrib \
@@ -26,15 +26,10 @@
 		-L${.OBJDIR}/../../lib/libdtrace \
 		-L${.OBJDIR}/../../lib/libproc \
 		-L${.OBJDIR}/../../lib/libctf \
-		-L${.OBJDIR}/../../lib/libelf
+		-L${.OBJDIR}/../../../lib/libelf
 
 LDADD+=		-ldtrace -ly -ll -lproc -lctf -lelf -lz
 
-.if ${MACHINE_ARCH} != "i386"
-LDFLAGS+=	-L/usr/local/lib
-LDADD+=		-lintl -liconv
-.endif
-
 #DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
 
 NO_MAN=