svn commit: r288911 - head/share/mk

[Bryan Drewery]

On 10/6/2015 2:17 PM, Simon J. Gerraty wrote:
> Bryan Drewery <bdrewery at FreeBSD.org> 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 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.


> 
>> the older /usr/share/mk as it is easier to support. If there's a problem
>> we fix in our local.sys.env.mk or bsd.port.mk for instance, it will be
>> used by updating the checkout.  This was something we backported,
>> without the src.conf inclusion in sys.mk, and were running with fine.
> 
> I might be confused...

If we update our checked in share/mk/custom.sys.env.mk file, we want all
builds to get it before having to install it to /usr/share/mk. We for a
period were using a script to wrap make to setup the environment before
we realized sys.mk was already capable of doing this. Being able to bind
a build to a specific environment is important, vs using the environment
installed from the last build or a foreign /usr/share/mk (FreeBSD's files).

> 
> It might help to differentiate the question of finding the right sys.mk
> which IMO is critical to a happy outcome, from what to do with src.* if
> present.
> 
> Normally anything under $SRCTOP should be subject to src.* - by
> definition.
> 
> But there's no reason you cannot make exceptions - by (as I think you
> already mentioned) adding a check for $SRCTOP/ports in local*sys*mk
> to suppress src.conf at least.
> 

Yes that has been my local fix for now.

Perhaps my fix should get checked in so no one else is surprised by
src.conf, and all of the tweaks its options set, coming in. It feels
really dirty though.

-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20151006/37fe2637/attachment.bin>