svn commit: r288911 - head/share/mk

[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
>   behavior because bsd.ports.mk depends on this in subtle
>   ways. The compat include of bsd.compiler.mk should
>   be removed in 12 anyway.
>   
>   PR:	203540
> 

Perhaps the wrong place to discuss this, but I will anyhow as I don't
think it will change.

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, from
/usr/src/share/mk/bsd.port.mk, which has a _WITHOUT_SRCCONF= guard set
on it to avoid bsd.own.mk from including src.conf.  But because sys.mk
is already included long before this, src.conf is already included and
anything handled in sys.mk has no real way to respect _WITHOUT_SRCCONF
unless it is in the environment.

[Note that the actual inclusion of src.conf no longer has a
_WITHOUT_SRCCONF= check, but that is trivial to fix]

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 the problem.

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, among other things).

As far as I can tell, the 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> or similar at the top of all src Makefiles.

I would really like to find a solution to this as it is a looming
problem for my work's build approaching in a few months. I figured out a
hack we can use locally, to set _WITHOUT_SRCCONF=, when the current
directory has "ports/" in it. That works for us, but not for other
vendors who don't realize this is coming.  Perhaps the scope of people
doing this is not large.

-- 
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-head/attachments/20151006/c6206b2d/attachment.bin>