Module Name: src
Committed By: ozaki-r
Date: Tue Mar 25 09:52:56 UTC 2014
Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
src/etc: Makefile.params
src/external/cddl: Makefile
src/external/cddl/osnet/lib: Makefile
src/external/cddl/osnet/usr.bin: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk bsd.prog.mk
src/tools: Makefile
Log Message:
Add MKCTF
This variable separates CTF stuffs from MKDTRACE; we can build DTrace
solely without building and using them. This allows us to use DTrace
even if CTF stuffs have problems (actually they have now).
This variable would be merged into MKDTRACE eventually, once CTF stuffs
work correctly again.
To generate a diff of this commit:
cvs rdiff -u -r1.1886 -r1.1887 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1465 -r1.1466 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.10 -r1.11 src/etc/Makefile.params
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/usr.bin/Makefile
cvs rdiff -u -r1.67 -r1.68 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.328 -r1.329 src/share/mk/bsd.README
cvs rdiff -u -r1.791 -r1.792 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.289 -r1.290 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.171 -r1.172 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1886 src/distrib/sets/lists/comp/mi:1.1887
--- src/distrib/sets/lists/comp/mi:1.1886 Mon Mar 24 13:42:40 2014
+++ src/distrib/sets/lists/comp/mi Tue Mar 25 09:52:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1886 2014/03/24 13:42:40 hannken Exp $
+# $NetBSD: mi,v 1.1887 2014/03/25 09:52:55 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -20,9 +20,9 @@
./usr/bin/config comp-util-bin
./usr/bin/crunchgen comp-c-bin
./usr/bin/crunchide comp-c-bin
-./usr/bin/ctfconvert comp-util-bin dtrace
-./usr/bin/ctfdump comp-util-bin dtrace
-./usr/bin/ctfmerge comp-util-bin dtrace
+./usr/bin/ctfconvert comp-util-bin ctf
+./usr/bin/ctfdump comp-util-bin ctf
+./usr/bin/ctfmerge comp-util-bin ctf
./usr/bin/cvs comp-cvs-bin cvs
./usr/bin/cvsbug comp-cvs-bin cvs
./usr/bin/elfedit comp-util-bin binutils
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1465 src/distrib/sets/lists/man/mi:1.1466
--- src/distrib/sets/lists/man/mi:1.1465 Wed Mar 19 15:26:41 2014
+++ src/distrib/sets/lists/man/mi Tue Mar 25 09:52:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1465 2014/03/19 15:26:41 nonaka Exp $
+# $NetBSD: mi,v 1.1466 2014/03/25 09:52:55 ozaki-r Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -125,9 +125,9 @@
./usr/share/man/cat1/csh.0 man-util-catman .cat
./usr/share/man/cat1/csplit.0 man-util-catman .cat
./usr/share/man/cat1/ctags.0 man-c-catman .cat
-./usr/share/man/cat1/ctfconvert.0 man-util-catman .cat,dtrace
-./usr/share/man/cat1/ctfdump.0 man-util-catman .cat,dtrace
-./usr/share/man/cat1/ctfmerge.0 man-util-catman .cat,dtrace
+./usr/share/man/cat1/ctfconvert.0 man-util-catman .cat,ctf
+./usr/share/man/cat1/ctfdump.0 man-util-catman .cat,ctf
+./usr/share/man/cat1/ctfmerge.0 man-util-catman .cat,ctf
./usr/share/man/cat1/cu.0 man-util-catman .cat
./usr/share/man/cat1/cut.0 man-util-catman .cat
./usr/share/man/cat1/daicctl.0 man-sysutil-catman .cat
@@ -3240,9 +3240,9 @@
./usr/share/man/html1/csh.html man-util-htmlman html
./usr/share/man/html1/csplit.html man-util-htmlman html
./usr/share/man/html1/ctags.html man-c-htmlman html
-./usr/share/man/html1/ctfconvert.html man-util-htmlman html,dtrace
-./usr/share/man/html1/ctfdump.html man-util-htmlman html,dtrace
-./usr/share/man/html1/ctfmerge.html man-util-htmlman html,dtrace
+./usr/share/man/html1/ctfconvert.html man-util-htmlman html,ctf
+./usr/share/man/html1/ctfdump.html man-util-htmlman html,ctf
+./usr/share/man/html1/ctfmerge.html man-util-htmlman html,ctf
./usr/share/man/html1/cu.html man-util-htmlman html
./usr/share/man/html1/cut.html man-util-htmlman html
./usr/share/man/html1/daicctl.html man-sysutil-htmlman html
@@ -5963,9 +5963,9 @@
./usr/share/man/man1/csh.1 man-util-man .man
./usr/share/man/man1/csplit.1 man-util-man .man
./usr/share/man/man1/ctags.1 man-c-man .man
-./usr/share/man/man1/ctfconvert.1 man-util-man .man,dtrace
-./usr/share/man/man1/ctfdump.1 man-util-man .man,dtrace
-./usr/share/man/man1/ctfmerge.1 man-util-man .man,dtrace
+./usr/share/man/man1/ctfconvert.1 man-util-man .man,ctf
+./usr/share/man/man1/ctfdump.1 man-util-man .man,ctf
+./usr/share/man/man1/ctfmerge.1 man-util-man .man,ctf
./usr/share/man/man1/cu.1 man-util-man .man
./usr/share/man/man1/cut.1 man-util-man .man
./usr/share/man/man1/daicctl.1 man-sysutil-man .man
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.10 src/etc/Makefile.params:1.11
--- src/etc/Makefile.params:1.10 Sun Jan 26 17:33:53 2014
+++ src/etc/Makefile.params Tue Mar 25 09:52:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.10 2014/01/26 17:33:53 apb Exp $
+# $NetBSD: Makefile.params,v 1.11 2014/03/25 09:52:55 ozaki-r Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -44,7 +44,7 @@ RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID
MACHINE MACHINE_ARCH MAKE MAKECONF MAKEFLAGS \
MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \
MKARZERO MKATF MKBFD MKBINUTILS MKCATPAGES \
- MKCRYPTO MKCRYPTO_RC5 MKCVS \
+ MKCRYPTO MKCRYPTO_RC5 MKCTF MKCVS \
MKDEBUG MKDEBUGLIB MKDOC MKDTRACE MKDYNAMICROOT \
MKGCC MKGCCCMDS MKGDB \
MKHESIOD MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \
Index: src/external/cddl/Makefile
diff -u src/external/cddl/Makefile:1.2 src/external/cddl/Makefile:1.3
--- src/external/cddl/Makefile:1.2 Thu Feb 25 00:14:10 2010
+++ src/external/cddl/Makefile Tue Mar 25 09:52:55 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/02/25 00:14:10 darran Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/25 09:52:55 ozaki-r Exp $
.include <bsd.own.mk>
# We need more modular flag e.g. we can add dtrace to osnet later
-.if ( ${MKZFS} != "no" || ${MKDTRACE} != "no" )
+.if ( ${MKZFS} != "no" || ${MKDTRACE} != "no" || ${MKCTF} != "no")
SUBDIR+= osnet
.endif
Index: src/external/cddl/osnet/lib/Makefile
diff -u src/external/cddl/osnet/lib/Makefile:1.5 src/external/cddl/osnet/lib/Makefile:1.6
--- src/external/cddl/osnet/lib/Makefile:1.5 Wed Sep 11 23:04:10 2013
+++ src/external/cddl/osnet/lib/Makefile Tue Mar 25 09:52:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/09/11 23:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/25 09:52:55 ozaki-r Exp $
#
#
@@ -6,6 +6,8 @@
.if (defined(MKDTRACE) && ${MKDTRACE} != "no")
SUBDIR+= libdtrace
+.endif
+.if ${MKDTRACE:Uno} != "no" || ${MKCTF:Uno} != "no"
SUBDIR+= libctf
.endif
Index: src/external/cddl/osnet/usr.bin/Makefile
diff -u src/external/cddl/osnet/usr.bin/Makefile:1.2 src/external/cddl/osnet/usr.bin/Makefile:1.3
--- src/external/cddl/osnet/usr.bin/Makefile:1.2 Sun Feb 21 01:46:36 2010
+++ src/external/cddl/osnet/usr.bin/Makefile Tue Mar 25 09:52:55 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/02/21 01:46:36 darran Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/25 09:52:55 ozaki-r Exp $
.include <bsd.own.mk>
-.if ${MKDTRACE} != "no"
+.if ${MKCTF} != "no"
SUBDIR+= ctfconvert ctfmerge ctfdump
.endif
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.67 src/share/man/man5/mk.conf.5:1.68
--- src/share/man/man5/mk.conf.5:1.67 Sun Jun 2 11:02:40 2013
+++ src/share/man/man5/mk.conf.5 Tue Mar 25 09:52:55 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.67 2013/06/02 11:02:40 mbalmer Exp $
+.\" $NetBSD: mk.conf.5,v 1.68 2014/03/25 09:52:55 ozaki-r Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -325,6 +325,13 @@ is compiled with support for
.In complex.h .
.DFLTy
.
+.It Sy MKCTF
+.YorN
+Indicates whether CTF tools are to be built and installed.
+If yes, the tools will be used to generate and manipulate
+CTF data of ELF binaries during build.
+.DFLTn
+.
.It Sy MKCRYPTO
.YorN
Indicates whether cryptographic code will be included in a build;
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.328 src/share/mk/bsd.README:1.329
--- src/share/mk/bsd.README:1.328 Mon Feb 24 07:23:41 2014
+++ src/share/mk/bsd.README Tue Mar 25 09:52:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.328 2014/02/24 07:23:41 skrll Exp $
+# $NetBSD: bsd.README,v 1.329 2014/03/25 09:52:55 ozaki-r Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -146,6 +146,11 @@ MKCRYPTO If "no", no cryptography suppor
MKCRYPTO_RC5 If not "no", RC5 support will be built into libcrypto_rc5
Default: no
+MKCTF If "no", do not build and install CTF tools, and also
+ don't generate and manipulate CTF data of ELF binaries
+ during build.
+ Default: no
+
MKCVS If "no", don't build or install cvs(1).
Default: yes
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.791 src/share/mk/bsd.own.mk:1.792
--- src/share/mk/bsd.own.mk:1.791 Mon Mar 24 21:25:03 2014
+++ src/share/mk/bsd.own.mk Tue Mar 25 09:52:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.791 2014/03/24 21:25:03 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.792 2014/03/25 09:52:55 ozaki-r Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -505,7 +505,7 @@ FC= ${TOOL_FC.${ACTIVE_FC}}
OBJC= ${TOOL_OBJC.${ACTIVE_OBJC}}
# Override with tools versions if needed
-.if exists(${TOOL_CTFCONVERT}) && exists(${TOOL_CTFMERGE})
+.if ${MKCTF:Uno} != "no" && exists(${TOOL_CTFCONVERT}) && exists(${TOOL_CTFMERGE})
CTFCONVERT= ${TOOL_CTFCONVERT}
CTFMERGE= ${TOOL_CTFMERGE}
.endif
@@ -972,7 +972,7 @@ MKGCCCMDS?= ${MKGCC}
#
_MKVARS.no= \
MKBSDGREP MKBSDTAR \
- MKCATPAGES MKCRYPTO_RC5 MKDEBUG \
+ MKCATPAGES MKCRYPTO_RC5 MKCTF MKDEBUG \
MKDEBUGLIB MKDTRACE MKEXTSRC \
MKKYUA MKLLD MKLLDB MKLINT \
MKMANZ MKMCLINKER MKOBJDIRS \
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.289 src/share/mk/bsd.prog.mk:1.290
--- src/share/mk/bsd.prog.mk:1.289 Sun Mar 9 18:00:51 2014
+++ src/share/mk/bsd.prog.mk Tue Mar 25 09:52:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.289 2014/03/09 18:00:51 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.290 2014/03/25 09:52:55 ozaki-r Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -62,7 +62,7 @@ OBJCFLAGS+= ${OBJCOPTS}
MKDEP_SUFFIXES?= .o .ln
# CTF preserve debug symbols
-.if defined(MKDTRACE) && (${MKDTRACE} != "no") && (${CFLAGS:M-g} != "")
+.if (${MKCTF:Uno} != "no") && (${CFLAGS:M-g} != "")
CTFFLAGS+= -g
CTFMFLAGS+= -g
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.171 src/tools/Makefile:1.172
--- src/tools/Makefile:1.171 Mon Feb 24 07:23:44 2014
+++ src/tools/Makefile Tue Mar 25 09:52:56 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.171 2014/02/24 07:23:44 skrll Exp $
+# $NetBSD: Makefile,v 1.172 2014/03/25 09:52:56 ozaki-r Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -69,6 +69,8 @@ DTRACE_BITS=
DTRACE_BITS+= .WAIT libelf
DTRACE_BITS+= .WAIT libdwarf
DTRACE_BITS+= .WAIT libctf
+.endif
+.if ${MKCTF} != "no"
DTRACE_BITS+= .WAIT ctfconvert ctfmerge
.endif
