From owner-freebsd-testing@FreeBSD.ORG Fri Jan 24 16:58:53 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 792E010C for ; Fri, 24 Jan 2014 16:58:53 +0000 (UTC) Received: from mail-we0-x22b.google.com (mail-we0-x22b.google.com [IPv6:2a00:1450:400c:c03::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 095B61291 for ; Fri, 24 Jan 2014 16:58:52 +0000 (UTC) Received: by mail-we0-f171.google.com with SMTP id w61so2979961wes.30 for ; Fri, 24 Jan 2014 08:58:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:cc:content-type:content-transfer-encoding; bh=MymXDn+HnsUp2weNHn79YD0KrrGRuhPLM6oro/O8Vf8=; b=jmmfoV09ZwcgCNw4PPgMWUfX3T5Hkdx18fLwZS+KzfhLcomZbklVbeHGDAeEFlNqSi c0b8h3Vw9xtxYXtFQlsaFO9dYKU611I/YKahq73f2g28zHy6NcIcmQUUdkBV8MGjf+GJ s0ZJOJDPJQCvOap2Skq3LDfg5g2tnjjVsfF5COlT99fw7lvPojrhMSDvrx/KDFf5drZm XOPfQHiWBFJ+ZipmZBFZVoQkvfE8K2hibk4tg90dkr5FHV9RaluGiFRi4XfwIp1JJvPi 2KKpwOgGBymUQvCBcaftjrZ66+jelErwL/K09d+RwipwjgjyfVlbSm1Fs7/qU/zDEXV4 Qj0w== MIME-Version: 1.0 X-Received: by 10.194.202.230 with SMTP id kl6mt14700970wjc.9.1390582731375; Fri, 24 Jan 2014 08:58:51 -0800 (PST) Sender: asomers@gmail.com Received: by 10.194.22.35 with HTTP; Fri, 24 Jan 2014 08:58:51 -0800 (PST) In-Reply-To: References: <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> <20140123210308.0E1D65807E@chaos.jnpr.net> <20140123215430.4B7B15807E@chaos.jnpr.net> <8D80A156-F649-4CA1-846A-DBAE9CC30627@gmail.com> <20140123221142.814FC5807E@chaos.jnpr.net> <7CB7D14F-7848-46B7-AB85-7E16145268D9@gmail.com> Date: Fri, 24 Jan 2014 09:58:51 -0700 X-Google-Sender-Auth: 4vIJ4Gp7xunPKOXNPJRCBGUx7R8 Message-ID: Subject: Re: Makefile.inc1.patch From: Alan Somers Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Cc: "freebsd-testing@freebsd.org" , Brooks Davis , "Simon J. Gerraty" X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jan 2014 16:58:53 -0000 On Thu, Jan 23, 2014 at 3:21 PM, Alan Somers wrote: > On Thu, Jan 23, 2014 at 3:15 PM, Garrett Cooper w= rote: >> On Jan 23, 2014, at 2:11 PM, Simon J. Gerraty wrote: >> >>>>> For options.mk I allow MK_* to already be set and WITHOUT_* to take >>>>> precedence over WITH_*. I also allow makefiles to have their own =3D >>>> lists >>>>> of options - separate the policy from the mechanism. >>>> >>>> Would that fix this case though? >>> >>> I imagine it would make fixing it easier. >>> >>>>> I guess you could even allow a per-knob setting as to which takes >>>>> precedence.=3D20 >>>> >>>> You mean override the default so WITH_* overrides WITHOUT_*? >>> >>> Yes - I expect that would be rare, but worth it for completness. >>> The important thing is a simple precidence rule. >>> >>>>> By simply allowing WITHOUT_* to overrule WITH_*, the Makefile.inc1 = =3D >>>> usage >>>>> would be greatly simplified. >>>> >>>> Maybe=3D85 the -DNO_* logic is a bit messy=3D85 >>> >>> NO_* always wins, it allows a makefile to say "I don't care what you >>> want I cannot do that". >>> >>> Most places you see -DNO_* used could be -DWITHOUT_* if the semantics >>> were not broken as previously described. >>> NO_* should be mainly for makefiles to set - like NO_MAN=3D (i don't go= t >>> no man page man) >>> >>>> Curious to see what you have in mind :).. >>> >>> Look at contrib/bmake/Makefile >> >> Ok, I=92ll definitely look at that. >> >> Alan, >> >> As far as fixing your issue is concerned though, has a fix already been = committed or does one still need to be committed? If the latter, does this = suffice for today =97 with the intent that it will get ripped out in favor = of something cleaner in the [near] future? > > Umm, I accidentally committed my earlier patch along with a different > change today. Oops. I'm currently testing your latest patch. I'm > happy with committing it if it works. > > -Alan Works for me. Do you want me to commit it for you? > >> >> Thanks! >> -Garrett