mk: Disable blacklist when disabling blocklist

WITHOUT_BLOCKLIST, when set, should enforce WITHOUT_BLACKLIST.
This fixes the build when WITHOUT_BLOCKLIST=yes is set.

Reported by:	ivy
Reviewed by:	ivy
Fixes:		7238317403 ("blocklist: Rename blacklist to blocklist")
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D56118
This commit is contained in:
Jose Luis Duran
2026-03-29 16:14:50 +00:00
parent 4f0d0ed5cb
commit 0d9676e1ca
2 changed files with 26 additions and 1 deletions
+18 -1
View File
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.Dd March 20, 2026
.Dd March 28, 2026
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -259,9 +259,20 @@ Set this if you do not want to build
.Xr blocklistd 8
and
.Xr blocklistctl 8 .
When set, it enforces these options:
.Pp
.Bl -item -compact
.It
.Va WITHOUT_BLACKLIST
.El
.Pp
When set, these options are also in effect:
.Pp
.Bl -inset -compact
.It Va WITHOUT_BLACKLIST_SUPPORT
(unless
.Va WITH_BLACKLIST_SUPPORT
is set explicitly)
.It Va WITHOUT_BLOCKLIST_SUPPORT
(unless
.Va WITH_BLOCKLIST_SUPPORT
@@ -274,6 +285,12 @@ support, like
.Xr fingerd 8
and
.Xr sshd 8 .
When set, it enforces these options:
.Pp
.Bl -item -compact
.It
.Va WITHOUT_BLACKLIST_SUPPORT
.El
.It Va WITHOUT_BLUETOOTH
Do not build Bluetooth related kernel modules, programs and libraries.
.It Va WITHOUT_BOOT
+8
View File
@@ -407,6 +407,14 @@ MK_BLOCKLIST:= no
MK_BLOCKLIST_SUPPORT:= no
.endif
.if ${MK_BLOCKLIST} == "no"
MK_BLACKLIST:= no
.endif
.if ${MK_BLOCKLIST_SUPPORT} == "no"
MK_BLACKLIST_SUPPORT:= no
.endif
.if ${MK_CDDL} == "no"
MK_CTF:= no
MK_DTRACE:= no