From owner-freebsd-current@FreeBSD.ORG Fri May 9 06:08:45 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 3FE26A95 for ; Fri, 9 May 2014 06:08:45 +0000 (UTC) Received: from mail-ee0-x229.google.com (mail-ee0-x229.google.com [IPv6:2a00:1450:4013:c00::229]) (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 C75D5A86 for ; Fri, 9 May 2014 06:08:44 +0000 (UTC) Received: by mail-ee0-f41.google.com with SMTP id t10so2276759eei.14 for ; Thu, 08 May 2014 23:08:42 -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=JITwFK5ARz7OOqanCO9ucDKArqOMky3Aa+cEv6LPcGo=; b=odOaiDLHZf6CoBbiocLlXugB1l+2luZtm4s5JlKhXj5lE6a8YWW017CDZYTt9sPlKx cR6F+db4fQ5wizKhLz4ynPPOH3eBi4qC3TSkqruaXC7YFvefxzB6/LmCBt03lvEcnrdo Q4Wl+NxD4fqlNgn+uBIarSkVYP7atYFTss2aoQc56AuaLlPJDrqTtIKrjuRvw2Ex8oWs cD/ltYHC8kWRQ92ayHrgQMxWZtI6ySY2fUe8aTsc9Q58BV9GqDdifLMSZiZWW3D9sotI zhXvFOAnDXdbLeStt2ftjPy1qdjMrcusd3j1AXXuxs8lQptePpReCAW2mMNgyUbsHNdZ IrEA== X-Received: by 10.14.220.130 with SMTP id o2mr10583795eep.42.1399615722582; Thu, 08 May 2014 23:08:42 -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 t4sm9073171eeb.29.2014.05.08.23.08.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 May 2014 23:08:41 -0700 (PDT) Sender: Sulev-Madis Silber Message-ID: <536C70E7.9080501@hot.ee> Date: Fri, 09 May 2014 09:08:39 +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> <536C55CB.8030108@hot.ee> <69557E7F-1B9B-480B-8D4B-525384F46B19@bsdimp.com> In-Reply-To: <69557E7F-1B9B-480B-8D4B-525384F46B19@bsdimp.com> X-TagToolbar-Keys: D20140509090839240 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 06:08:45 -0000 On 2014-05-09 07:32, Warner Losh wrote: > > On May 8, 2014, at 10:12 PM, Sulev-Madis Silber (ketas) wrote: > >> 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. > > To be clear, you define SRCCONF in /etc/make.conf (or the file defined by __MAKE_CONF). The file defined by SRCCONF has WITHOUT_NIS=t defined, but that’s not effective, even with my change. However, if you add an include to the file defined by __MAKE_CONF, then it is effective… Is that what you are telling me? > >> 9.2, BTW... unsure if it matters here? > > I’m doing my testing on 10-stable… I’ll have to try on my 9.x system… But it is a lot slower than my 10.x system... > > Warner > Yes, that's exactly what I mean. It seems to partially work now. I actually have lot of WITHOUT_*'s. That install error is really weird, never seen it before. All I know is that before all those changes, everything worked well. And if I .include file, old behavior (everything works as expected) is back.