From owner-svn-src-all@freebsd.org Fri Jan 10 23:18:25 2020 Return-Path: Delivered-To: svn-src-all@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 A238B1F64FF; Fri, 10 Jan 2020 23:18:25 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-ua1-x942.google.com (mail-ua1-x942.google.com [IPv6:2607:f8b0:4864:20::942]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47vf6n3pfPz4Gtt; Fri, 10 Jan 2020 23:18:25 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-ua1-x942.google.com with SMTP id c7so1372542uaf.5; Fri, 10 Jan 2020 15:18:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SVOjK/S6wPRrNC/OG2C7qto2aNa2HQQ0OZD+8YrXceg=; b=Dz/UazS/idq3wrXufGKIWt+GMrMfvCw6EMl5H11hmBIkHoASeCcsuL3EwyO3r7X0ET E4kdIAsoYgOJHOp69Jm5qtowtYCjRF9l5LAqvhbN/WA928dNqPYXnOQP+sYOkbVSmdYc 2s/S1HB+HgddJedQlq0brmVW22WwsiJqJ85KgYZ2hxG+FtboU7MNLRhaKG3vgocyUc+6 fHBpn2+SwbleMlebCpY0fJ9zRanD61k3uKsi96mO2V5NzxpSfmzqCaAnQiRqDdUh9TH9 J+KqDiAKyuj49Qz5SDhLdl5EPgJtFZeH/f5CVOM2AultyqOtR8h0MC49dhgpOili7RHf XMEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SVOjK/S6wPRrNC/OG2C7qto2aNa2HQQ0OZD+8YrXceg=; b=EoSkkAgVjq3QzV2Y9V8R5SLlHJqhYIw9hsBBDXCVz+5lln5gVH8NYv8GBqPXcfqMH1 pfpMWVLlxfVSoWJN0kHiC675Mo6eewHsqYMbq6Cm1vjkRm8lCennLlMim+ZSGYIIXrXn XRaABPUYXDOYcY17r6U4WhUlLFnK+iijuyXdLMzKLJG4WtjWY/YvIzS+ttz9OCVcOwSq iShO8fW7UocYCpDU3ZBjUN0p7qTX1oHkfYY7i4PUMczNoiL/AicqmsZ3S7efjzL9eULl 4HmM09fxQuXC4NCxftb1ZklA8jox0UQwzgj5bOYX+CCnYSNoawhfU9uXN6ORnokai4kB ia0A== X-Gm-Message-State: APjAAAXBWJ4d1yyBhZcxKd+08vZl7y/icsL/7rHAgVgOS0bXn8p5dSIn 7LEc2kQHcAONFgmfpmHicpxT8t4Bx/6mPeL75HlayZZq X-Google-Smtp-Source: APXvYqwYi8rV4uBcSFAKOOf1NQk5moU2xEDg1o+LckIM8ihSx49HbKhb48tKGt/swl2vC8DCEPlXZcHqRmippop63W4= X-Received: by 2002:ab0:7049:: with SMTP id v9mr3704853ual.95.1578698304147; Fri, 10 Jan 2020 15:18:24 -0800 (PST) MIME-Version: 1.0 References: <202001102200.00AM0eBf082664@repo.freebsd.org> In-Reply-To: <202001102200.00AM0eBf082664@repo.freebsd.org> From: Enji Cooper Date: Fri, 10 Jan 2020 15:18:13 -0800 Message-ID: Subject: Re: svn commit: r356615 - head/share/mk To: Ed Maste Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 47vf6n3pfPz4Gtt X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jan 2020 23:18:25 -0000 On Fri, Jan 10, 2020 at 2:00 PM Ed Maste 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