On 2014-05-09 02:54, Warner Losh wrote:
>
> On May 8, 2014, at 3:26 PM, Guy Yur <guy...@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.
9.2, BTW... unsure if it matters here?
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
