Date: Thu, 8 May 2014 22:32:52 -0600 From: Warner Losh <imp@bsdimp.com> To: "Sulev-Madis Silber (ketas)" <madis555@hot.ee> Cc: freebsd-current@freebsd.org, Guy Yur <guyyur@gmail.com> Subject: Re: WITHOUT_NIS after bsd.opts.mk / src.opts.mk split Message-ID: <69557E7F-1B9B-480B-8D4B-525384F46B19@bsdimp.com> In-Reply-To: <536C55CB.8030108@hot.ee> References: <CAC67Hz_TLidKJfg1McqgqGKyOHcpE%2BuhHPHWWiEynpD9YrFV7w@mail.gmail.com> <1A74E775-B873-44E1-8323-D3C292A3D02E@bsdimp.com> <536C55CB.8030108@hot.ee>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
On May 8, 2014, at 10:12 PM, Sulev-Madis Silber (ketas) <madis555@hot.ee> wrote:
> On 2014-05-09 02:54, Warner Losh wrote:
>>
>> On May 8, 2014, at 3:26 PM, Guy Yur <guyyur@gmail.com> 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(__<src.opts.mk>__)
>> __<src.opts.mk>__:
>>
>> -# Compat -- needed still?
>> -.include <bsd.own.mk>
>> -
>> -# 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 <bsd.own.mk>
>> +
>> #
>> # 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
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - https://gpgtools.org
iQIcBAEBCgAGBQJTbFp0AAoJEGwc0Sh9sBEA8NEQALPSXJwV62Vzjfez7CHye6ye
U4zLFFd+7Ar2MTFr1z4dx3mJILSv9ASte7lcBEN8VDx5JwBVJ/d6B3CW0TVn77MI
ZHzYV9Afhw1ADTeF4yBaf7tg7BznHHSUt7MWHG8E95M/k9t2MlseRPtl+UvYo6PI
Zhp1MeSWztJVtCGWCs1cPawT3Vrbi0UTTLrIxQu/C8O74dDTwfd4wcoje2FJgYbg
j3TIVd+YyYEG6uoc4QD8VSxqer8f/bc1ZnGfpsZdlzFYqgGzUIIVexvpbAfYCFy7
acR8xpPH2S8uCTPG/KnDsS3uPkqW68sOG2vkcbc8Vt6Q1JPZd5HtnjlYAXVh4qQ7
/5nEkhKrnlOaT3ugxemFwgvtxBfO5TBsKCt+R3RLgNMKw/Vn0qCedGSB0DhU/E2A
lLOTwV/PlyN92Z7kQ9Mg1BP3U/7bMHL/yRXnBLzeL/lBdsSvExzfQU5gdSU5gsrl
/JaKpy1Txobj4P4PBriNTZD4EQJQhqSd7A6n68DNtlkZjlaRTwFk9g/Hiq+U/Kyk
BQ9DDj15OZl37h9kzFr6fSXz+ysC7iHLkSnN08ul4cQNdcSHPfwV2hqVnZY/PNts
jk8UpXDOGv1ZxE5YTzkL+2huvNuif80nwgRYguhDEyg42Pyz3/JceVhHriiub4zC
mMo1zkYZlIu3ha5ffxWb
=aWB/
-----END PGP SIGNATURE-----
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69557E7F-1B9B-480B-8D4B-525384F46B19>