D42077.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D42077.diff
View Options

	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
	@@ -218,7 +218,6 @@
	ZONEINFO_LEAPSECONDS_SUPPORT \

	__REQUIRED_OPTIONS = \
	- CAPSICUM \
	CASPER

	# LEFT/RIGHT. Left options which default to "yes" unless their corresponding
	@@ -383,10 +382,6 @@
	# Force some options off if their dependencies are off.
	# Order is somewhat important.
	#
	-.if ${MK_CAPSICUM} == "no"
	-MK_CASPER:= no
	-.endif
	-
	.if ${MK_SOURCELESS} == "no"
	MK_SOURCELESS_HOST:= no
	MK_SOURCELESS_UCODE:= no
	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 +0,0 @@
	-This option has no effect.
	diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile
	--- a/usr.bin/xz/Makefile
	+++ b/usr.bin/xz/Makefile
	@@ -43,10 +43,6 @@
	-I${LZMALIBDIR} \
	-I${XZDIR}/common

	-.if ${MK_CAPSICUM} == "no"
	-CFLAGS+= -DWITHOUT_CAPSICUM
	-.endif
	-
	LIBADD= lzma

	.include <bsd.prog.mk>