From owner-svn-src-all@freebsd.org Sun May 29 15:03:39 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3EC8B535D1; Sun, 29 May 2016 15:03:39 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 942131695; Sun, 29 May 2016 15:03:39 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (ppp121-45-225-151.lns20.per1.internode.on.net [121.45.225.151]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id u4TF3Rcj025019 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 29 May 2016 08:03:30 -0700 (PDT) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r300233 - stable/10/share/mk To: Bryan Drewery , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org References: <201605192141.u4JLfZEM020505@repo.freebsd.org> From: Julian Elischer Message-ID: <3bc44b60-2f25-011d-c423-a06f57b05bd7@freebsd.org> Date: Sun, 29 May 2016 23:03:22 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 In-Reply-To: <201605192141.u4JLfZEM020505@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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: Sun, 29 May 2016 15:03:39 -0000 On 20/05/2016 5:41 AM, Bryan Drewery wrote: > Author: bdrewery > Date: Thu May 19 21:41:35 2016 > New Revision: 300233 > URL: https://svnweb.freebsd.org/changeset/base/300233 I always assumed there was a good reason for not allowing that. is there not a "WITH_FOO" or "WITHOUT_FOO" for every MK_FOO? > > Log: > Allow MK_ overrides. > > This is a direct commit to stable. > > This was done in head in r264661 and is needed to force certain options off > for ports. > > PR: D6271 > Sponsored by: EMC / Isilon Storage Division > > Modified: > stable/10/share/mk/bsd.own.mk > > Modified: stable/10/share/mk/bsd.own.mk > ============================================================================== > --- stable/10/share/mk/bsd.own.mk Thu May 19 21:08:33 2016 (r300232) > +++ stable/10/share/mk/bsd.own.mk Thu May 19 21:41:35 2016 (r300233) > @@ -483,9 +483,6 @@ __DEFAULT_NO_OPTIONS+=HYPERV > .if defined(WITH_${var}) && defined(WITHOUT_${var}) > .error WITH_${var} and WITHOUT_${var} can't both be set. > .endif > -.if defined(MK_${var}) > -.error MK_${var} can't be set by a user. > -.endif > .if defined(WITHOUT_${var}) > MK_${var}:= no > .else > @@ -501,9 +498,6 @@ MK_${var}:= yes > .if defined(WITH_${var}) && defined(WITHOUT_${var}) > .error WITH_${var} and WITHOUT_${var} can't both be set. > .endif > -.if defined(MK_${var}) > -.error MK_${var} can't be set by a user. > -.endif > .if defined(WITH_${var}) > MK_${var}:= yes > .else > @@ -621,9 +615,6 @@ MK_TESTS:= no > .if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT) > .error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set. > .endif > -.if defined(MK_${var}_SUPPORT) > -.error MK_${var}_SUPPORT can't be set by a user. > -.endif > .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" > MK_${var}_SUPPORT:= no > .else > @@ -640,9 +631,6 @@ MK_${var}_SUPPORT:= yes > .if defined(WITH_${vv:H}) && defined(WITHOUT_${vv:H}) > .error WITH_${vv:H} and WITHOUT_${vv:H} can't both be set. > .endif > -.if defined(MK_${vv:H}) > -.error MK_${vv:H} can't be set by a user. > -.endif > .if defined(WITH_${vv:H}) > MK_${vv:H}:= yes > .elif defined(WITHOUT_${vv:H}) > @@ -661,9 +649,6 @@ MK_${vv:H}:= ${MK_${vv:T}} > .if defined(WITH_${var}) && defined(WITHOUT_${var}) > .error WITH_${var} and WITHOUT_${var} can't both be set. > .endif > -.if defined(MK_${var}) > -.error MK_${var} can't be set by a user. > -.endif > .if ${COMPILER_FEATURES:Mc++11} > .if defined(WITHOUT_${var}) > MK_${var}:= no > >