Re: svn commit: r288911 - head/share/mk

2015-10-09 Thread Simon J. Gerraty
I seem to be getting mails out of order... Bryan Drewery wrote: > > So why are we including src.conf in sys.mk and not > > src.opts.mk ? > > > > We're including it there because Simon wanted it included there so > > meta-mode settings were visible in s

Re: svn commit: r288911 - head/share/mk

2015-10-08 Thread Bryan Drewery
On 10/8/2015 11:40 AM, Warner Losh wrote: > > We're including it there because Simon wanted it included there so > > meta-mode settings were visible in sys.mk > . I thought it > > lame at the > > time, but had no better solution. > > > > A

Re: svn commit: r288911 - head/share/mk

2015-10-08 Thread Warner Losh
On Thu, Oct 8, 2015 at 10:03 AM, Bryan Drewery wrote: > On 10/8/15 9:00 AM, Warner Losh wrote: > > > > On Wed, Oct 7, 2015 at 7:39 PM, Bryan Drewery > > wrote: > > > > On 10/6/2015 1:24 PM, Warner Losh wrote: > > >> With the META_MODE changes, sjg introduced

Re: svn commit: r288911 - head/share/mk

2015-10-08 Thread Bryan Drewery
On 10/8/15 9:00 AM, Warner Losh wrote: > > On Wed, Oct 7, 2015 at 7:39 PM, Bryan Drewery > 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

Re: svn commit: r288911 - head/share/mk

2015-10-08 Thread Warner Losh
On Wed, Oct 7, 2015 at 7:39 PM, Bryan Drewery 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 early, that can be used for overriding > >> things like MAKEOBJDIRPREFIX, enabling META_MOD

Re: svn commit: r288911 - head/share/mk

2015-10-07 Thread Bryan Drewery
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 early, that can be used for overriding >> things like MAKEOBJDIRPREFIX, enabling META_MODE (it needs to be set >> extremely early for AUTO_OBJ support,

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Simon J. Gerraty
Bryan Drewery wrote: > > Are you refering to a src/share/mk which is sibling to src/ports/* or > > something else? > > > > Because with MAKESYSPATH=.../share/mk src/share/mk/sys.mk is what you > > should find. > > Right. That's what I'm referring to and what I prefer. Ok good. > If we update

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Bryan Drewery
On 10/6/2015 2:17 PM, Simon J. Gerraty wrote: > Bryan Drewery wrote: >>> But wouldn't that imply that /usr/src/share/mk is the right set of >>> makefiles to use for /usr/src/ports/ >>> >>> What would you consider the right sys.mk etc would be in such a case? >>> >> >> For our case we want the chec

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Warner Losh
On Tue, Oct 6, 2015 at 3:05 PM, Simon J. Gerraty wrote: > Warner Losh wrote: > > > The sys.mk change to include src.conf breaks building ports in a > sub-dir > > > of src. Meaning, /usr/src/ports/. The MAKESYSPATH with '.../share/mk' > > > finds /usr/src/share/mk and runs off with all of the sr

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Simon J. Gerraty
Warner Losh wrote: > > The sys.mk change to include src.conf breaks building ports in a sub-dir > > of src. Meaning, /usr/src/ports/. The MAKESYSPATH with '.../share/mk' > > finds /usr/src/share/mk and runs off with all of the src.*.mk stuff long > > before the port Makefile includes bsd.port.mk,

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Simon J. Gerraty
Bryan Drewery wrote: > > But wouldn't that imply that /usr/src/share/mk is the right set of > > makefiles to use for /usr/src/ports/ > > > > What would you consider the right sys.mk etc would be in such a case? > > > > For our case we want the checked in src/share/mk to be used rather than Are

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Warner Losh
> On Oct 6, 2015, at 12:02 PM, Bryan Drewery wrote: > > On 10/5/2015 9:18 PM, Warner Losh wrote: >> Author: imp >> Date: Tue Oct 6 04:18:48 2015 >> New Revision: 288911 >> URL: https://svnweb.freebsd.org/changeset/base/288911 >> >> Log: >> Previous versions of bsd.own.mk included bsd.compiler

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Bryan Drewery
On 10/6/2015 12:50 PM, Simon J. Gerraty wrote: > Bryan Drewery wrote: >> Why would anyone build ports in a sub-dir of src? It's convenient for a >> vendor building their own product that needs their own ports tree. Some >> decisions can't easily be changed; if the root of the source code >> check

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Simon J. Gerraty
Bryan Drewery wrote: > Why would anyone build ports in a sub-dir of src? It's convenient for a > vendor building their own product that needs their own ports tree. Some > decisions can't easily be changed; if the root of the source code > checkout is already src/, there is no simple way to avoid

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Bryan Drewery
On 10/6/2015 11:02 AM, Bryan Drewery wrote: > On 10/5/2015 9:18 PM, Warner Losh wrote: >> Author: imp >> Date: Tue Oct 6 04:18:48 2015 >> New Revision: 288911 >> URL: https://svnweb.freebsd.org/changeset/base/288911 >> >> Log: >> Previous versions of bsd.own.mk included bsd.compiler.mk >> only

Re: svn commit: r288911 - head/share/mk

2015-10-06 Thread Bryan Drewery
On 10/5/2015 9:18 PM, Warner Losh wrote: > Author: imp > Date: Tue Oct 6 04:18:48 2015 > New Revision: 288911 > URL: https://svnweb.freebsd.org/changeset/base/288911 > > Log: > Previous versions of bsd.own.mk included bsd.compiler.mk > only when _WITHOUT_SRCCONF wasn't defined. Restore this >

svn commit: r288911 - head/share/mk

2015-10-05 Thread Warner Losh
Author: imp Date: Tue Oct 6 04:18:48 2015 New Revision: 288911 URL: https://svnweb.freebsd.org/changeset/base/288911 Log: Previous versions of bsd.own.mk included bsd.compiler.mk only when _WITHOUT_SRCCONF wasn't defined. Restore this behavior because bsd.ports.mk depends on this in subtle