From owner-freebsd-current@FreeBSD.ORG Fri May 9 04:13:21 2014 Return-Path: Delivered-To: freebsd-current@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 9597C33E for ; Fri, 9 May 2014 04:13:21 +0000 (UTC) Received: from mail-ee0-x233.google.com (mail-ee0-x233.google.com [IPv6:2a00:1450:4013:c00::233]) (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 29499ED4 for ; Fri, 9 May 2014 04:13:21 +0000 (UTC) Received: by mail-ee0-f51.google.com with SMTP id e51so2226470eek.10 for ; Thu, 08 May 2014 21:13:19 -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=HVkDX/einqPDFU3Q6/RNUZSPSHqeB7iGCfWSctby2f0=; b=wwuir/fDdQQ3cxXMF+kRvyV20EhiL91g7cC1XEUxUxEsYLSpDfuAdQPGR9ozV5M7t9 SbaR8hczGE6Gq/2iRKkib4PBJJKaHrxm3xZAJJFeOsDpaXzESXbsPyzWR/LVjRd8RDXM l3Z/dMeEs1iEXOa1U150i9eFknlTWoIatq1AKJvFgpOl6GJ4tyopPgzsWZITZTO8bi0j 7r55+DV7syU7/ag1nNZ20WpsibdoTICQxRyXgl1dSyJweSqNRHDypEwMug4uoQMU5iuP FljyyZRPobFzOom3gFK/haHsbfTnoM3kkppNW1g6oHS5G5ukWdh/ZyWh4Rf+AxWnD+09 7ZCw== X-Received: by 10.15.54.6 with SMTP id s6mr10002402eew.4.1399608799355; Thu, 08 May 2014 21:13:19 -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 s46sm8567508ees.3.2014.05.08.21.13.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 May 2014 21:13:17 -0700 (PDT) Sender: Sulev-Madis Silber Message-ID: <536C55CB.8030108@hot.ee> Date: Fri, 09 May 2014 07:12:59 +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: D20140509071248511 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 04:13:21 -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 > Sorry, that didn't exactly help. I don't fully get what went so wrong there? Now I got this during install: --------------------------------------------------- ===> gnu/lib/libregex/doc (install) install-info: not found *** Error code 127 --------------------------------------------------- It was total WTF error but just in case I tried putting ".include <../src.conf>" back, and it worked! I use __MAKE_CONF, and inside that file I have SRCCONF. 9.2, BTW... unsure if it matters here?