Module Name: src
Committed By: darran
Date: Sun Feb 21 11:00:02 UTC 2010
Modified Files:
src/external/cddl/osnet/usr.bin/ctfconvert: Makefile
src/external/cddl/osnet/usr.bin/ctfmerge: Makefile
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
Log Message:
DTrace: fix a problem with library references for libctf and libdtrace.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.bin/ctfconvert/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.sbin/dtrace/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/usr.bin/ctfconvert/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfconvert/Makefile:1.2 src/external/cddl/osnet/usr.bin/ctfconvert/Makefile:1.3
--- src/external/cddl/osnet/usr.bin/ctfconvert/Makefile:1.2 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/usr.bin/ctfconvert/Makefile Sun Feb 21 11:00:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/21 01:46:36 darran Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/21 11:00:01 darran Exp $
# $FreeBSD: src/cddl/usr.bin/ctfconvert/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -42,9 +42,12 @@
-g
.ifndef HOSTPROG
+LIBCTF_OBJDIR!= cd ${.CURDIR}/../../lib/libctf && ${PRINTOBJDIR}
+
LDADD+= -L${OSNETDIR}/lib/libctf \
-L${NETBSDSRCDIR}/external/bsd/libdwarf/lib \
- -L${NETBSDSRCDIR}/external/bsd/libelf/lib
+ -L${NETBSDSRCDIR}/external/bsd/libelf/lib \
+ -L${LIBCTF_OBJDIR}
LDADD+= -lctf -ldwarf -lelf -lz
.endif
Index: src/external/cddl/osnet/usr.bin/ctfmerge/Makefile
diff -u src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.2 src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.3
--- src/external/cddl/osnet/usr.bin/ctfmerge/Makefile:1.2 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/usr.bin/ctfmerge/Makefile Sun Feb 21 11:00:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/21 01:46:36 darran Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/21 11:00:01 darran Exp $
# $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -36,10 +36,9 @@
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
.ifndef HOSTPROG
-LDADD+= -L${OSNETDIR}/lib/libctf \
- -L${NETBSDSRCDIR}/exernal/bsd/libdwarf/lib \
- -L${NETBSDSRCDIR}/external/bsd/libelf/lib
-LDADD+= -lctf -ldwarf -lelf -lz -lpthread
+LIBCTF_OBJDIR!= cd ${.CURDIR}/../../lib/libctf && ${PRINTOBJDIR}
+LDADD+= -L${LIBCTF_OBJDIR} -lctf
+LDADD+= -ldwarf -lelf -lz -lpthread
.endif
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
Index: src/external/cddl/osnet/usr.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.2 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.3
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.2 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Sun Feb 21 11:00:02 2010
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/02/21 01:46:36 darran Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/21 11:00:02 darran Exp $
# $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
+.include <bsd.own.mk>
.include "../../Makefile.inc"
PROG= dtrace
@@ -26,20 +27,15 @@
#CFLAGS+= -DNEED_ERRLOC
#YFLAGS+= -d
-LDFLAGS+= -pthread \
- -L${OSNETDIR}/lib/libdtrace \
- -L${OSNETDIR}/lib/libctf
-LDADD+= -ldtrace -ly -ll -lctf -lelf -lz
+LDFLAGS+= -pthread
-#LDFLAGS+= -pthread \
- -L${.OBJDIR}/../../lib/libdtrace \
- -L${.OBJDIR}/../../lib/libproc \
- -L${.OBJDIR}/../../lib/libctf \
- -L${.OBJDIR}/../../../lib/libelf
+LIBCTF_OBJDIR!= cd ${.CURDIR}/../../lib/libctf && ${PRINTOBJDIR}
+LDFLAGS+= -L${LIBDTRACE_OBJDIR} -ldtrace
-#LDADD+= -ldtrace -ly -ll -lproc -lctf -lelf -lz
+LIBDTRACE_OBJDIR!= cd ${.CURDIR}/../../lib/libdtrace && ${PRINTOBJDIR}
+LDFLAGS+= -L${LIBCTF_OBJDIR} -lctf
-#DPADD+= ${LIBDTRACE} ${LIBCTF} ${LIBELF} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
+LDADD+= -ly -ll -lelf -lz
.include <bsd.prog.mk>
