svn commit: r288911 - head/share/mk

[Warner Losh]

On Thu, Oct 8, 2015 at 10:03 AM, Bryan Drewery <bdrewery at freebsd.org> wrote:

> On 10/8/15 9:00 AM, Warner Losh wrote:
> >
> > On Wed, Oct 7, 2015 at 7:39 PM, Bryan Drewery <bdrewery at freebsd.org
> > <mailto:bdrewery at freebsd.org>> wrote:
> >
> >     On 10/6/2015 1:24 PM, Warner Losh wrote:
> >     >> With the META_MODE changes, sjg introduced this /etc/src-env.conf
> file
> >     >> that is included from sys.mk <http://sys.mk> early, that can be
> used for overriding
> >     >> things like MAKEOBJDIRPREFIX, enabling META_MODE (it needs to be
> set
> >     >> extremely early for AUTO_OBJ support, among other things).
> >     >>
> >     >> As far as I can tell, the sys.mk <http://sys.mk> change to
> include src.conf early was
> >     >> done out of convenience.  Meaning, we could remove that and just
> add
> >     >> back a .include <src.init.mk <http://src.init.mk>> or similar at
> the top of all src
> >     Makefiles.
> >     > All src makefiles? Yea, I’d rather hoped to avoid that, though it
> is easily
> >     > scripted. I’d thought of this solution at the time I did the
> MAKESYSPATH
> >     > hack, and rejected it as being too unwieldy. And having that at
> the top
> >     > of all the files would still require MAKESYSPATH need to be
> …/share/mk
> >     > to work out. I was rather hoping we could find some good way around
> >     > doing that.
> >
> >     r289000 confuses me. Clearly src.opts.mk <http://src.opts.mk> is
> >     still needed in Makefiles.
> >     So why are we including src.conf in sys.mk <http://sys.mk> and not
> >     src.opts.mk <http://src.opts.mk>?
> >
> >
> > We're including it there because Simon wanted it included there so
> > meta-mode settings were visible in sys.mk <http://sys.mk>. I thought it
> > lame at the
> > time, but had no better solution.
> >
>
> Ah! So the /etc/src-env.conf thing I referenced does replace it. So we
> can remove src.conf from sys.mk now. It came in via r284598, and I
> documented it and added it to src.conf.5/makeman later on.
>
> I'll go ahead and do that since there's no impact to meta mode now.
>
> That at least resolves my issues with nested port builds - ignoring that
> src.*.mk still gets included which I haven't had a problem with and is
> my own fault and intention given I want the MAKESYSPATH from local
> checkout!
>

If you haven't made a commit yet, I'd be keen on reviewing the change.

Warner