Page MenuHomeFreeBSD
Files F96393924

D40592.diff
No OneTemporary
Actions

D40592.diff
View Options

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
--- 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 @@
.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
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -76,9 +76,7 @@
BSNMP \
BZIP2 \
CALENDAR \
- CAPSICUM \
CAROOT \
- CASPER \
CCD \
CDDL \
CLANG \
@@ -217,6 +215,8 @@
ZONEINFO_LEAPSECONDS_SUPPORT \
__REQUIRED_OPTIONS = \
+ CAPSICUM \
+ CASPER
# LEFT/RIGHT. Left options which default to "yes" unless their corresponding
# RIGHT option is disabled.
diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM
deleted file mode 100644
--- a/tools/build/options/WITHOUT_CAPSICUM
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Do not build Capsicum support into system programs.
diff --git a/tools/build/options/WITHOUT_CASPER b/tools/build/options/WITHOUT_CASPER
deleted file mode 100644
--- a/tools/build/options/WITHOUT_CASPER
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Do not build Casper program and related libraries.

File Metadata

Mime Type
text/plain
Expires
Wed, Sep 25, 7:35 PM (2 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12785547
Default Alt Text
D40592.diff (1 KB)

Event Timeline