PERFORCE change 103942 for review

[John Birrell]

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

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