From owner-p4-projects@FreeBSD.ORG  Sun Jul 30 00: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 BFE2316A4E0; Sun, 30 Jul 2006 00:15:25 +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 9822B16A4DE
	for <perforce@freebsd.org>; Sun, 30 Jul 2006 00:15:25 +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 47D5743D46
	for <perforce@freebsd.org>; Sun, 30 Jul 2006 00:15:25 +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 k6U0FPfV072268
	for <perforce@freebsd.org>; Sun, 30 Jul 2006 00:15:25 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6U0FOjn072265
	for perforce@freebsd.org; Sun, 30 Jul 2006 00:15:24 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 30 Jul 2006 00:15:24 GMT
Message-Id: <200607300015.k6U0FOjn072265@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 102754 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: Sun, 30 Jul 2006 00:15:26 -0000

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

Change 102754 by jb@jb_freebsd2 on 2006/07/30 00:15:07

	Allow non-386 architectures to use libelf for ports for the time being.
	
	This is a temporary measure until jkoshy's libbsdelf is available. He
	thinks it will be a few weeks from now. His library will make life so
	much easier because it uses FreeBSD headers natively without the need
	for hacks and it will support cross-building which is something the
	Sun and ports libelfs aren't designed to do.

Affected files ...

.. //depot/projects/dtrace/src/cddl/lib/Makefile#4 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#4 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#2 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#4 edit
.. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#5 edit

Differences ...

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

@@ -1,5 +1,9 @@
 # $FreeBSD$
 
-SUBDIR= libctf libdtrace libelf libproc
+SUBDIR= libctf libdtrace libproc
+
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+= libelf
+.endif
 
 .include <bsd.subdir.mk>

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

@@ -41,6 +41,11 @@
 
 LDADD+=		-lctf -ldwarf -lelf -lz
 
+.if ${MACHINE_ARCH} != "i386"
+LDFLAGS+=	-L/usr/local/lib
+LDADD+=		-lintl -liconv
+.endif
+
 .PATH:		${.CURDIR}
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt

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

@@ -22,6 +22,11 @@
 
 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#4 (text+ko) ====

@@ -38,6 +38,11 @@
 
 LDADD+=		-lctf -ldwarf -lelf -lz
 
+.if ${MACHINE_ARCH} != "i386"
+LDFLAGS+=	-L/usr/local/lib
+LDADD+=		-lintl -liconv
+.endif
+
 .PATH:		${.CURDIR}/../ctfconvert
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt

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

@@ -30,6 +30,11 @@
 
 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=