From owner-svn-src-stable@freebsd.org Sun Sep 27 22:48:44 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A880B374561; Sun, 27 Sep 2020 22:48:44 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C01643Dldz4WR4; Sun, 27 Sep 2020 22:48:44 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5388C13F75; Sun, 27 Sep 2020 22:48:44 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08RMmijX066208; Sun, 27 Sep 2020 22:48:44 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08RMmiS3066207; Sun, 27 Sep 2020 22:48:44 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202009272248.08RMmiS3066207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Sun, 27 Sep 2020 22:48:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r366208 - stable/12/share/mk X-SVN-Group: stable-12 X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: stable/12/share/mk X-SVN-Commit-Revision: 366208 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2020 22:48:44 -0000 Author: emaste Date: Sun Sep 27 22:48:43 2020 New Revision: 366208 URL: https://svnweb.freebsd.org/changeset/base/366208 Log: MFC r356615: 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. Modified: stable/12/share/mk/src.opts.mk Directory Properties: stable/12/ (props changed) Modified: stable/12/share/mk/src.opts.mk ============================================================================== --- stable/12/share/mk/src.opts.mk Sun Sep 27 22:26:41 2020 (r366207) +++ stable/12/share/mk/src.opts.mk Sun Sep 27 22:48:43 2020 (r366208) @@ -477,6 +477,7 @@ MK_CTF:= no MK_OPENSSL:= no MK_OPENSSH:= no MK_KERBEROS:= no +MK_KERBEROS_SUPPORT:= no .endif .if ${MK_CXX} == "no" @@ -508,6 +509,7 @@ MK_NLS_CATALOGS:= no MK_DMAGENT:= no MK_OPENSSH:= no MK_KERBEROS:= no +MK_KERBEROS_SUPPORT:= no MK_LDNS:= no MK_PKGBOOTSTRAP:= no MK_SVN:= no