diff options
| author | rwatson <rwatson@FreeBSD.org> | 2012-01-02 21:57:58 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2012-01-02 21:57:58 +0000 |
| commit | 0494e8ff396fa7b13e09da8c014c574e6a72e67f (patch) | |
| tree | 4301604772a4257148ed459fec955283de0d2dae | |
| parent | dcadc0dd871dc634ed73e13c2707d5446cbf920e (diff) | |
| download | FreeBSD-src-0494e8ff396fa7b13e09da8c014c574e6a72e67f.zip FreeBSD-src-0494e8ff396fa7b13e09da8c014c574e6a72e67f.tar.gz | |
Add WITHOUT_CAPSICUM src.conf(5) define, which can be used to compile out
use of Capsicum by userspace applications.
MFC after: 3 weeks
Sponsored by: Google, Inc.
| -rw-r--r-- | share/man/man5/src.conf.5 | 7 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_CAPSICUM | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index ab5adc5..37f490f 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd December 2, 2011 +.Dd December 30, 2011 .Dt SRC.CONF 5 .Os .Sh NAME @@ -251,6 +251,9 @@ Set to build some programs without optional bzip2 support. .\" from FreeBSD: head/tools/build/options/WITHOUT_CALENDAR 156932 2006-03-21 07:50:50Z ru Set to not build .Xr calendar 1 . +.It Va WITHOUT_CAPSICUM +.\" $FreeBSD$ +Set to not build Capsicum support into system programs. .It Va WITHOUT_CDDL .\" from FreeBSD: head/tools/build/options/WITHOUT_CDDL 163861 2006-11-01 09:02:11Z jb Set to not build code licensed under Sun's CDDL. @@ -821,7 +824,7 @@ Set to not build .Xr ppp 8 and related programs. .It Va WITHOUT_PROFILE -.\" from FreeBSD: head/tools/build/options/WITH_PROFILE 228143 2011-11-29 19:46:17Z fjoe +.\" from FreeBSD: head/tools/build/options/WITHOUT_PROFILE 228196 2011-12-02 09:09:54Z fjoe Set to avoid compiling profiled libraries. .It Va WITHOUT_QUOTAS .\" from FreeBSD: head/tools/build/options/WITHOUT_QUOTAS 183242 2008-09-21 22:02:26Z sam diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 9a51608..d3183c4 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -322,6 +322,7 @@ __DEFAULT_YES_OPTIONS = \ BSNMP \ BZIP2 \ CALENDAR \ + CAPSICUM \ CDDL \ CPP \ CRYPT \ diff --git a/tools/build/options/WITHOUT_CAPSICUM b/tools/build/options/WITHOUT_CAPSICUM new file mode 100644 index 0000000..8d719e9 --- /dev/null +++ b/tools/build/options/WITHOUT_CAPSICUM @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to not build Capsicum support into system programs. |
