Remove WITHOUT_CAPSICUM build support
Capsicum is non-optional as of c24c117b96 ("Remove
WITHOUT_{CAPSICUM,CASPER} options").
`#ifndef WITHOUT_CAPSICUM` is left in the source for the benefit of
downstream consumers, but is never defined in FreeBSD.
Reviewed by: oshogbo
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D42077
This commit is contained in:
@@ -218,7 +218,6 @@ __DEFAULT_NO_OPTIONS = \
|
|||||||
ZONEINFO_LEAPSECONDS_SUPPORT \
|
ZONEINFO_LEAPSECONDS_SUPPORT \
|
||||||
|
|
||||||
__REQUIRED_OPTIONS = \
|
__REQUIRED_OPTIONS = \
|
||||||
CAPSICUM \
|
|
||||||
CASPER
|
CASPER
|
||||||
|
|
||||||
# LEFT/RIGHT. Left options which default to "yes" unless their corresponding
|
# LEFT/RIGHT. Left options which default to "yes" unless their corresponding
|
||||||
@@ -383,10 +382,6 @@ BROKEN_OPTIONS+= TESTS
|
|||||||
# Force some options off if their dependencies are off.
|
# Force some options off if their dependencies are off.
|
||||||
# Order is somewhat important.
|
# Order is somewhat important.
|
||||||
#
|
#
|
||||||
.if ${MK_CAPSICUM} == "no"
|
|
||||||
MK_CASPER:= no
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_SOURCELESS} == "no"
|
.if ${MK_SOURCELESS} == "no"
|
||||||
MK_SOURCELESS_HOST:= no
|
MK_SOURCELESS_HOST:= no
|
||||||
MK_SOURCELESS_UCODE:= no
|
MK_SOURCELESS_UCODE:= no
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
This option has no effect.
|
|
||||||
@@ -43,10 +43,6 @@ CFLAGS+= -DHAVE_CONFIG_H \
|
|||||||
-I${LZMALIBDIR} \
|
-I${LZMALIBDIR} \
|
||||||
-I${XZDIR}/common
|
-I${XZDIR}/common
|
||||||
|
|
||||||
.if ${MK_CAPSICUM} == "no"
|
|
||||||
CFLAGS+= -DWITHOUT_CAPSICUM
|
|
||||||
.endif
|
|
||||||
|
|
||||||
LIBADD= lzma
|
LIBADD= lzma
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|||||||
Reference in New Issue
Block a user