Page MenuHomeFreeBSD

restore include of make.conf to orginal location
ClosedPublic

Authored by sjg on Jun 18 2015, 6:20 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Nov 13, 8:39 AM
Unknown Object (File)
Thu, Oct 31, 12:38 PM
Unknown Object (File)
Mon, Oct 28, 5:11 PM
Unknown Object (File)
Oct 2 2024, 3:00 AM
Unknown Object (File)
Oct 1 2024, 10:39 PM
Unknown Object (File)
Sep 24 2024, 4:00 PM
Unknown Object (File)
Sep 22 2024, 5:32 PM
Unknown Object (File)
Sep 22 2024, 5:32 PM

Details

Summary

Including make.conf early breaks users who have
non-trivial things there.

Move its include back to where it was, and include
local.sys.env.mk early - which we specifically define to
only do things safe at that early point.

Might as well add a corresponding src-env.conf to
include via src.sys.env.mk

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

sjg retitled this revision from to restore include of make.conf to orginal location.
sjg updated this object.
sjg edited the test plan for this revision. (Show Details)
sjg added a reviewer: imp.
sjg updated this object.

simplify include of SRC_ENV_CONF

Looks like this differential was generated from a tree that differed from a vanilla head.
When I ran arc patch D2860 it couldn't find share/mk/src.sys.env.mk.

Avg: I did

svn cp local.sys.mk local.sys.env.mk
svn cp src.sys.mk src.sys.env.mk

so no you won't find them in svn yet

First blush, this looks good to me. I'll sleep on it to see if anything bubbles up while the rest of my brain is off...

In D2860#55283, @sjg wrote:

svn cp local.sys.mk local.sys.env.mk
svn cp src.sys.mk src.sys.env.mk

arc patch D2860 still failed to apply cleanly, so I can't test.

This revision was automatically updated to reflect the committed changes.