From owner-freebsd-current@FreeBSD.ORG Fri May 9 02:22:59 2014 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8BBBAD9 for ; Fri, 9 May 2014 02:22:59 +0000 (UTC) Received: from mail-ee0-x22c.google.com (mail-ee0-x22c.google.com [IPv6:2a00:1450:4013:c00::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B5EB1BC for ; Fri, 9 May 2014 02:22:59 +0000 (UTC) Received: by mail-ee0-f44.google.com with SMTP id c41so2144392eek.31 for ; Thu, 08 May 2014 19:22:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=6AfOcfaDcAUZ3T24MhEZxLQUzGceNQ0t6+oIt98txIg=; b=Bxg+E8CZaHt8qBeSJeqdgXPl/PEr+TFmgpqM2dIbExsL82PqZ6U47aJPrKMT7bM66/ aPPag22RC3Mj1NKSPwzKeivGU19jM6/7ld097UofD4myIFXYgQZQ3CKc2g7o8AIt6g7m EgrqJeAIJdszlsWIXvdr8yZiCZQ0LyRNAjMJYZcQMrH9c8L3ScEE39EFaVp2svXDwDht tEazg4mFSupma/cdBo3QQQO5BQS419qUEgqR7E2GR8Ho9zco5m1SiX25dGMw0TUxnyjN DlQc03NvdxQ0CZOmZAaPBX5kIHs8mIlKU4yw2ss2rNur/61nULpqos6K0tIKXg5oUZ6u ZTqg== X-Received: by 10.15.34.197 with SMTP id e45mr9411890eev.112.1399602177102; Thu, 08 May 2014 19:22:57 -0700 (PDT) Received: from ketas-laptop.mydomain (ketas-laptop6.si.pri.ee. [2001:ad0:91f:0:21a:6bff:fe66:2ad3]) by mx.google.com with ESMTPSA id 8sm4704595eea.10.2014.05.08.19.22.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 May 2014 19:22:56 -0700 (PDT) Sender: Sulev-Madis Silber Message-ID: <536C3BFD.1010700@hot.ee> Date: Fri, 09 May 2014 05:22:53 +0300 From: "Sulev-Madis Silber (ketas)" User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:15.0) Gecko/20120912 Thunderbird/15.0.1 MIME-Version: 1.0 To: Warner Losh Subject: Re: WITHOUT_NIS after bsd.opts.mk / src.opts.mk split References: <1A74E775-B873-44E1-8323-D3C292A3D02E@bsdimp.com> In-Reply-To: <1A74E775-B873-44E1-8323-D3C292A3D02E@bsdimp.com> X-TagToolbar-Keys: D20140509052252861 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: freebsd-current@freebsd.org, Guy Yur X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2014 02:22:59 -0000 On 2014-05-09 02:54, Warner Losh wrote: > > On May 8, 2014, at 3:26 PM, Guy Yur wrote: > >> Hi, >> >> After the bsd.opts.mk / src.opts.mk split >> WITHOUT_NIS in src.conf doesn't work. > > It should still work… At least that’s the intention... > >> src.conf is included in src.opts.mk after bsd.own.mk >> which includes bsd.opts.mk. > > Yea, that’s a problem… It should be included after. > >> Should bsd.opts.mk options overrides now be set in >> make.conf instead of src.conf? > > That’s a good workaround until I get that fix tested and committed. Or you could include src.conf in make.conf at the end. Either will have the same effect. > > Here’s the fix I’m testing, if you’d like to test that instead... > > diff -r d69444b828c1 share/mk/src.opts.mk > --- a/share/mk/src.opts.mk > +++ b/share/mk/src.opts.mk > @@ -30,17 +30,15 @@ > .if !target(____) > ____: > > -# Compat -- needed still? > -.include > - > -# Allow user to configure things, but in the future this will move > -# elsehwere... > - > +# Allow user to configure things that only effect src tree builds. > SRCCONF?= /etc/src.conf > .if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" > .include "${SRCCONF}" > .endif > > +# Must be included after src.conf > +.include > + > # > # Define MK_* variables (which are either "yes" or "no") for users > # to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the > > >> Was on r265455, updated to r265715 and rebuilt with -DNO_CLEAN. > > Yea, sorry about missing this subtle issue in the split. There was another report of something similar that I hadn’t tracked down, but your report pointed me to where I needed to go. > > Warner > Finally! Trying it now... I was about to take deep look into it because that bothered me so much.