diff options
author | Colin Percival <cperciva@FreeBSD.org> | 2023-06-18 00:03:56 +0000 |
---|---|---|
committer | Colin Percival <cperciva@FreeBSD.org> | 2023-06-20 00:23:09 +0000 |
commit | c24c117b96445ecdbd4bf9856f88118b376296c3 (patch) | |
tree | c98ae49a155b30c50c548561c72653f5f3d26141 /share | |
parent | bce9967915115e00271b01f1698bfca30a9be1cc (diff) | |
download | src-c24c117b96445ecdbd4bf9856f88118b376296c3.tar.gz src-c24c117b96445ecdbd4bf9856f88118b376296c3.zip |
Remove WITHOUT_{CAPSICUM,CASPER} options
At this point CAPSICUM and CASPER are merely forced on via the newly
added __REQUIRED_OPTIONS list; after stable/14 branches I'll sweep
the tree for MK_{CAPSICUM,CASPER}.
This change will not be MFCed.
Discussed on: freebsd-arch
Differential Revision: https://reviews.freebsd.org/D40592
Diffstat (limited to 'share')
-rw-r--r-- | share/man/man5/src.conf.5 | 12 | ||||
-rw-r--r-- | share/mk/src.opts.mk | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 08511661e328..815ffc62fc39 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd May 30, 2023 +.Dd June 17, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -260,19 +260,9 @@ Build some programs without optional bzip2 support. .It Va WITHOUT_CALENDAR Do not build .Xr calendar 1 . -.It Va WITHOUT_CAPSICUM -Do not build Capsicum support into system programs. -When set, it enforces these options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_CASPER -.El .It Va WITHOUT_CAROOT Do not add the trusted certificates from the Mozilla NSS bundle to base. -.It Va WITHOUT_CASPER -Do not build Casper program and related libraries. .It Va WITH_CCACHE_BUILD Use .Xr ccache 1 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 8120e23cb28b..3c17f9319619 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -76,9 +76,7 @@ __DEFAULT_YES_OPTIONS = \ BSNMP \ BZIP2 \ CALENDAR \ - CAPSICUM \ CAROOT \ - CASPER \ CCD \ CDDL \ CLANG \ @@ -217,6 +215,8 @@ __DEFAULT_NO_OPTIONS = \ ZONEINFO_LEAPSECONDS_SUPPORT \ __REQUIRED_OPTIONS = \ + CAPSICUM \ + CASPER # LEFT/RIGHT. Left options which default to "yes" unless their corresponding # RIGHT option is disabled. |