cddl/*: add a WITH(OUT)_DTRACE option

Add an option to enable/disable DTrace without disabling ZFS.  New
architectures such as CHERI may support ZFS before they support DTrace
and the old model of WITHOUT_CDDL disabling both wasn't helpful.

For compatiblity, the CDDL option remains and WITHOUT_CDDL implies
WITHOUT_DTRACE.  WITHOUT_DTRACE also implies WITHOUT_CTF.

As part of this change, largely convert cddl/*/Makefile to using the
more compact SUBDIR.${MK_<FOO>}+= form rather than using intermediate
variables.

Reviewed by:	markj
Obtained from:	CheriBSD
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D35718

1 files changed, 11 insertions, 1 deletions

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index f1ca36e5597d..82c32772e762 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd June 22, 2022
+.Dd July 6, 2022
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -328,6 +328,8 @@ When set, it enforces these options:
 .It
 .Va WITHOUT_CTF
 .It
+.Va WITHOUT_DTRACE
+.It
 .Va WITHOUT_LOADER_ZFS
 .It
 .Va WITHOUT_ZFS
@@ -612,6 +614,14 @@ Do not build dma Mail Transport Agent.
 .It Va WITHOUT_DOCCOMPRESS
 Do not install compressed system documentation.
 Only the uncompressed version will be installed.
+.It Va WITHOUT_DTRACE
+Do not build DTrace framework kernel modules, libraries, and user commands.
+When set, it enforces these options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_CTF
+.El
 .It Va WITH_DTRACE_TESTS
 Build and install the DTrace test suite in
 .Pa /usr/tests/cddl/usr.sbin/dtrace .