Date: Fri, 10 Jan 2020 15:18:13 -0800 From: Enji Cooper <yaneurabeya@gmail.com> To: Ed Maste <emaste@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r356615 - head/share/mk Message-ID: <CAGHfRMBzasmXUBVAGbpG32_gj6UHVAZ1Q4NLoesaqvYM9%2Bmqqg@mail.gmail.com> In-Reply-To: <202001102200.00AM0eBf082664@repo.freebsd.org> References: <202001102200.00AM0eBf082664@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jan 10, 2020 at 2:00 PM Ed Maste <emaste@freebsd.org> wrote: > > Author: emaste > Date: Fri Jan 10 22:00:39 2020 > New Revision: 356615 > URL: https://svnweb.freebsd.org/changeset/base/356615 > > Log: > 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. I don't think this is the right change to make, given that src.opts.mk ( https://svnweb.freebsd.org/base/head/share/mk/src.opts.mk?revision=356615&view=markup#l233 ) states: 233 # MK_*_SUPPORT options which default to "yes" unless their corresponding 234 # MK_* variable is set to "no". The right change to make would be to shift these special cases to the variable defined on line 227 ( https://svnweb.freebsd.org/base/head/share/mk/src.opts.mk?revision=356615&view=markup#l227 ): 225 # LEFT/RIGHT. Left options which default to "yes" unless their corresponding 226 # RIGHT option is disabled. 227 __DEFAULT_DEPENDENT_OPTIONS= \ 228 CLANG_FULL/CLANG \ 229 LOADER_VERIEXEC/BEARSSL \ 230 LOADER_EFI_SECUREBOOT/LOADER_VERIEXEC \ 231 VERIEXEC/BEARSSL \ If `MK_CRYPT == no`'s setting of `MK_KERBEROS:=no` was moved here, then the rest would just work by virtue of precedence. Thanks, -Enji
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGHfRMBzasmXUBVAGbpG32_gj6UHVAZ1Q4NLoesaqvYM9%2Bmqqg>