PERFORCE change 102754 for review

[John Birrell]

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

Change 102754 by jb at 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=