aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2020-01-10 22:00:39 +0000
committerEd Maste <emaste@FreeBSD.org>2020-01-10 22:00:39 +0000
commit0ce9d0af5b7fdfde335c753cb3310650a9d31d09 (patch)
tree31080c6e65e5b020ddee6ca79ec1d46daba0a873
parent53f8212826c42318f07b3bb75b4d04838eee4a73 (diff)
src.opts.mk: force KERBEROS_SUPPORT off where KERBEROS forced off
Explicitly setting WITHOUT_KERBEROS implies WITHOUT_KERBEROS_SUPPORT, but previously other cases that forced KERBEROS off (such as WITHOUT_CRYPT) did not also set KERBEROS_SUPPORT off. Because the _SUPPORT dependent options (KERBEROS/KERBEROS_SUPPORT) are processed before other dependencies (CRYPT/KERBEROS) it's not easy to make this happen automatically. Instead just explicitly set KERBEROS_SUPPORT off where we set KERBEROS off. Reported by: Michael Dexter's Build Option Survey run
Notes
Notes: svn path=/head/; revision=356615
-rw-r--r--share/mk/src.opts.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index b758825d51ed..9bbc11c2fab7 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -459,6 +459,7 @@ MK_CTF:= no
MK_OPENSSL:= no
MK_OPENSSH:= no
MK_KERBEROS:= no
+MK_KERBEROS_SUPPORT:= no
.endif
.if ${MK_CXX} == "no"
@@ -498,6 +499,7 @@ MK_NLS_CATALOGS:= no
.if ${MK_OPENSSL} == "no"
MK_OPENSSH:= no
MK_KERBEROS:= no
+MK_KERBEROS_SUPPORT:= no
MK_LDNS:= no
.endif