From owner-p4-projects@FreeBSD.ORG  Tue Aug 15 02:15:25 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 DF3AE16A4DF; Tue, 15 Aug 2006 02:15:24 +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 B67E416A4DE
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:15:24 +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 83FCC43D45
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:15:24 +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 k7F2FOJd082856
	for <perforce@freebsd.org>; Tue, 15 Aug 2006 02:15:24 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2FOtn082853
	for perforce@freebsd.org; Tue, 15 Aug 2006 02:15:24 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 15 Aug 2006 02:15:24 GMT
Message-Id: <200608150215.k7F2FOtn082853@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 103942 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 02:15:25 -0000

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

Change 103942 by jb@jb_freebsd2 on 2006/08/15 02:14:51

	Just use the installed libelf on all architectures. Time is better
	spent helping out jkoshy's libbsdelf development than messing
	with Sun's libelf.

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#6 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#3 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#6 edit

Differences ...

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

@@ -41,11 +41,6 @@
 
 LDADD+=		-lctf -ldwarf -lelf -lz
 
-.if ${MACHINE_ARCH} != "i386"
-LDFLAGS+=	-L/usr/local/lib
-LDADD+=		-lintl -liconv
-.endif
-
 .if ${MK_LIBC_THREADS} == "no"
 LDADD+= -lpthread
 .endif

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#3 (text+ko) ====

@@ -22,11 +22,6 @@
 
 LDADD+=		-lelf -lz
 
-.if ${MACHINE_ARCH} != "i386"
-LDFLAGS+=	-L/usr/local/lib
-LDADD+=		-lintl -liconv
-.endif
-
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump

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

@@ -38,11 +38,6 @@
 
 LDADD+=		-lctf -ldwarf -lelf -lz
 
-.if ${MACHINE_ARCH} != "i386"
-LDFLAGS+=	-L/usr/local/lib
-LDADD+=		-lintl -liconv
-.endif
-
 .if ${MK_LIBC_THREADS} == "no"
 LDADD+= -lpthread
 .endif