Date: Thu, 8 Oct 2015 09:03:59 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Warner Losh <imp@bsdimp.com> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r288911 - head/share/mk Message-ID: <561693EF.50808@FreeBSD.org> In-Reply-To: <CANCZdfrTppL=umBHYxj-gGrjb8omR3BcocWJtEXkSPAktVOGzg@mail.gmail.com> References: <201510060418.t964Innu071170@repo.freebsd.org> <56140CAD.8080200@FreeBSD.org> <8D5D1CE5-BC57-464D-9C47-63EFF4C1CF2F@bsdimp.com> <5615C935.2060204@FreeBSD.org> <CANCZdfrTppL=umBHYxj-gGrjb8omR3BcocWJtEXkSPAktVOGzg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 10/8/15 9:00 AM, Warner Losh wrote: >=20 > On Wed, Oct 7, 2015 at 7:39 PM, Bryan Drewery <bdrewery@freebsd.org > <mailto:bdrewery@freebsd.org>> wrote: >=20 > On 10/6/2015 1:24 PM, Warner Losh wrote: > >> With the META_MODE changes, sjg introduced this /etc/src-env.con= f 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 inclu= de 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=E2=80=99d rather hoped to avoid that, t= hough it is easily > > scripted. I=E2=80=99d thought of this solution at the time I did = the MAKESYSPATH > > hack, and rejected it as being too unwieldy. And having that at t= he top > > of all the files would still require MAKESYSPATH need to be =E2=80= =A6/share/mk > > to work out. I was rather hoping we could find some good way arou= nd > > doing that. >=20 > 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>? >=20 >=20 > 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. >=20 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 checko= ut! --=20 Regards, Bryan Drewery
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?561693EF.50808>