CVS commit: src/external/cddl/osnet/usr.sbin/dtrace
Module Name:src
Committed By: simonb
Date: Sat Mar 27 02:58:39 UTC 2021
Modified Files:
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
Log Message:
Use LDADD/DPADD instead of PROGDPLIBS - we are linking against installed
libraries.
Use compat/exec.mk - dtrace isn't compat32 friendly (yet?).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.14 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.15
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.14 Sat Apr 4 13:15:48 2020
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Sat Mar 27 02:58:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/04/04 13:15:48 christos Exp $
+# $NetBSD: Makefile,v 1.15 2021/03/27 02:58:39 simonb Exp $
# $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -39,13 +39,9 @@ COPTS.dtrace.c += -Wno-missing-field-ini
COPTS.dtrace.c += -Wno-format
LDFLAGS+= -pthread
+LDADD+= -lctf -ldtrace -lelf -lproc -ly -ll -lz
+DPADD+= ${LIBCTF} ${LIBDTRACE} ${LIBELF} ${LIBPROC} ${LIBY} ${LIBL} ${LIBZ}
-PROGDPLIBS+= ctf ${.CURDIR}/../../lib/libctf
-PROGDPLIBS+= dtrace ${.CURDIR}/../../lib/libdtrace
-PROGDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf
-PROGDPLIBS+= proc ${NETBSDSRCDIR}/external/bsd/libproc/lib
-PROGDPLIBS+= y ${NETBSDSRCDIR}/lib/liby
-PROGDPLIBS+= l ${NETBSDSRCDIR}/external/bsd/flex/lib
-PROGDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+.include "../../compat/exec.mk"
.include
CVS commit: src/external/cddl/osnet/usr.sbin/dtrace
Module Name:src
Committed By: christos
Date: Sat Apr 4 13:15:48 UTC 2020
Modified Files:
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
Log Message:
Add libproc
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.13 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.14
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.13 Fri Jun 29 07:33:47 2018
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Sat Apr 4 09:15:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/06/29 11:33:47 kamil Exp $
+# $NetBSD: Makefile,v 1.14 2020/04/04 13:15:48 christos Exp $
# $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -43,6 +43,7 @@ LDFLAGS+= -pthread
PROGDPLIBS+= ctf ${.CURDIR}/../../lib/libctf
PROGDPLIBS+= dtrace ${.CURDIR}/../../lib/libdtrace
PROGDPLIBS+= elf ${NETBSDSRCDIR}/external/bsd/elftoolchain/lib/libelf
+PROGDPLIBS+= proc ${NETBSDSRCDIR}/external/bsd/libproc/lib
PROGDPLIBS+= y ${NETBSDSRCDIR}/lib/liby
PROGDPLIBS+= l ${NETBSDSRCDIR}/external/bsd/flex/lib
PROGDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
CVS commit: src/external/cddl/osnet/usr.sbin/dtrace
Module Name:src Committed By: kamil Date: Wed Jun 6 14:31:45 UTC 2018 Modified Files: src/external/cddl/osnet/usr.sbin/dtrace: Makefile Log Message: Make cddl/osnet/usr.sbin/dtrace -W compatible with MKLLVM=yes Clang/LLVM does not recognize: - -Wno-discarded-qualifiers - -Wno-unused-but-set-variable This is a step forward functional MKLLVM=yes HAVE_LLVM=yes build. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 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.sbin/dtrace/Makefile diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.10 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.11 --- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.10 Mon May 28 21:05:11 2018 +++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Wed Jun 6 14:31:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2018/05/28 21:05:11 chs Exp $ +# $NetBSD: Makefile,v 1.11 2018/06/06 14:31:45 kamil Exp $ # $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $ @@ -32,9 +32,11 @@ COPTS.dtrace.c += -Wno-stack-protector COPTS.dtrace.c += -Wno-format-extra-args COPTS.dtrace.c += -Wno-shadow +.if defined(HAVE_GCC) COPTS.dtrace.c += -Wno-discarded-qualifiers -COPTS.dtrace.c += -Wno-missing-field-initializers COPTS.dtrace.c += -Wno-unused-but-set-variable +.endif +COPTS.dtrace.c += -Wno-missing-field-initializers COPTS.dtrace.c += -Wno-format LDFLAGS+= -pthread
CVS commit: src/external/cddl/osnet/usr.sbin/dtrace
Module Name:src
Committed By: roy
Date: Thu Feb 4 21:26:48 UTC 2016
Modified Files:
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
Log Message:
Add -Wno-format-nonliteral
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.7 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.8
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.7 Thu Feb 4 20:06:29 2016
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Thu Feb 4 21:26:48 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/02/04 20:06:29 roy Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/04 21:26:48 roy Exp $
# $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -30,6 +30,7 @@ CFLAGS+= -I${OSNETDIR}/sys \
COPTS.dtrace.c += -Wno-stack-protector
COPTS.dtrace.c += -Wno-format-extra-args
+COPTS.dtrace.c += -Wno-format-nonliteral
COPTS.dtrace.c += -Wno-format-security
LDFLAGS+= -pthread
CVS commit: src/external/cddl/osnet/usr.sbin/dtrace
Module Name:src
Committed By: roy
Date: Thu Feb 4 20:06:29 UTC 2016
Modified Files:
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
Log Message:
dtrace needs Wno-format-security for clang it seems.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.6 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.7
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.6 Thu Sep 24 14:36:54 2015
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Thu Feb 4 20:06:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/09/24 14:36:54 christos Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/04 20:06:29 roy Exp $
# $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -29,7 +29,8 @@ CFLAGS+= -I${OSNETDIR}/sys \
#YFLAGS+= -d
COPTS.dtrace.c += -Wno-stack-protector
-COPTS.dtrace.c += -Wno-stack-protector -Wno-format-extra-args
+COPTS.dtrace.c += -Wno-format-extra-args
+COPTS.dtrace.c += -Wno-format-security
LDFLAGS+= -pthread
CVS commit: src/external/cddl/osnet/usr.sbin/dtrace
Module Name:src
Committed By: riz
Date: Sun Jan 12 17:48:26 UTC 2014
Modified Files:
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
Log Message:
Disable the extra-args warning for printf formats in dtrace.c
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.4 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.5
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.4 Mon Feb 22 12:21:27 2010
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Sun Jan 12 17:48:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/02/22 12:21:27 tron Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/12 17:48:25 riz Exp $
# $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
@@ -6,6 +6,7 @@
.include ../../Makefile.inc
PROG= dtrace
+MAN= dtrace.1
BINDIR?= /usr/sbin
@@ -28,6 +29,7 @@ CFLAGS+= -I${OSNETDIR}/sys \
#YFLAGS+= -d
COPTS.dtrace.c += -Wno-stack-protector
+COPTS.dtrace.c += -Wno-stack-protector -Wno-format-extra-args
LDFLAGS+= -pthread
@@ -39,4 +41,5 @@ LDFLAGS+= -L${LIBCTF_OBJDIR} -lctf
LDADD+= -ly -ll -lelf -lz
+
.include bsd.prog.mk
