Commit Graph

22 Commits

Author SHA1 Message Date
Simon J. Gerraty
f957a32dac Update meta.sys.mk and related local*mk
Move the setting of TARGET_SPEC_VARS to local.sys.env.mk
so meta.sys.mk can do the processing, and include local.meta.sys.mk
later.

Move the setting of GENDIRDEPS_FILTER*_VARS from local.gendirdeps.mk
to local.meta.sys.mk so we can automatically set DEP_* at level 1+
to avoid syntax errors when DEP_* variables are used in conditionals
in Makefile.depend files.

Update gendirdeps.mk just to get the documentation about the above.
No functional change.

local.dirdeps.mk be more careful about adding to DIRDEPS to avoid
unnecessary overhead, and introducing cycles in the graph.
Also set DEP_MACHINE_CPUARCH.

Reviewed by:	stevek
Sponsored by:	Juniper Networks, Inc.
Differential Revision:	https://reviews.freebsd.org/D39737
2023-04-20 20:38:53 -07:00
Simon J. Gerraty
bf7aa99a55 Update meta mode makefiles
meta2deps - add checks to detect truncated/corrupted filemon data
(only known to happen on Linux hosts), to ensure we do not auto
update dependencies based on incomplete data.

meta.stage.mk adds STAGE_SHLIB_LINKS_FILTER and STAGE_LINK_AS_*

We also allow for hosts where egrep is deprecated for grep -E

Reviewed by: stevek
2023-04-16 18:40:53 -07:00
Simon J. Gerraty
960b77be8f Update dirdeps.mk et al to latest
Move some local tweaks to local.*.mk

Reviewed by:	bdrewery
MFC after:	1 week
Differential Revision: https://reviews.freebsd.org/D27300
2020-11-24 21:45:38 +00:00
Simon J. Gerraty
312809fe7f Update dirdeps.mk and gendirdeps.mk
The env space consumed by exporting all libc's .meta files
left little room for command line,
so unexport when done.

Update dirdeps.mk to latest and add
dirdeps-targets.mk to simplify/update targets/Makefile

Makefile changes to go with Makefile.depend changes in D22494

Reviewed by:	 bdrewery
MFC after:	1 week
Sponsored by:   Juniper Networks
Differential Revision:  https://reviews.freebsd.org/D22495
2019-12-11 17:38:15 +00:00
Simon J. Gerraty
a6589ab760 Update dirdeps.mk et al to latest
dirdeps.mk and meta.autodep.mk will now look for
Makefile.depend.options
to handle optional dependencies, the work is all done by
dirdeps-options.mk

Also update to latest meta.stage.mk and gendirdeps.mk

Reviewed by:	bdrewery
Differential Revision:	https://reviews.freebsd.org/D15701
2018-08-02 21:33:45 +00:00
Simon J. Gerraty
b47b9f6bd8 Update meta* from bmake-20161212 2016-12-23 02:57:00 +00:00
Simon J. Gerraty
51c71d3e03 Update dirdeps.mk et al
dirdeps.mk: move logic to handle -f dirdeps.mk to inside check
for first read of dirdeps.mk

Also fix handling of WITHOUT_DIRDEPS_BELOW

gendirdeps.mk: pass M2D_EXCLUDES to meta2deps

meta.autodep.mk: if we build with nofilemon, leave a cookie to
prevent updating dependencies until cleaned.

Reviewed by:	bdrewery
2016-04-18 20:56:21 +00:00
Simon J. Gerraty
be19d90b61 Merge bmake-20160307 2016-03-11 01:35:39 +00:00
Bryan Drewery
af928aa0cc Import latest gendirdeps.mk 1.29 from contrib/bmake/mk 2016-01-25 18:40:25 +00:00
Simon J. Gerraty
ccfb965433 Add META_MODE support.
Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.

Still need to add real targets under targets/ to build packages.

Differential Revision:       D2796
Reviewed by: brooks imp
2015-06-13 19:20:56 +00:00
Simon J. Gerraty
6251c65a82 Latest dirdeps.mk sets DEP_RELDIR for itself.
This helps guard against bugs in manually edited Makefile.depend
files, and avoids the need to call realpath from the Makefile.depend file.
2015-06-08 23:34:04 +00:00
Simon J. Gerraty
10ea6face3 Update to latest versions. 2014-05-05 17:58:00 +00:00
Simon J. Gerraty
06137b0f50 Bring meta2deps.sh closer to par with meta2deps.py 2013-05-11 05:10:31 +00:00
Simon J. Gerraty
01f18a0c87 If TARGET_OBJ_SPEC is no just MACHINE, pass it to meta2deps.py 2013-05-11 00:52:57 +00:00
Simon J. Gerraty
876336c858 Sync latest versions 2013-04-14 01:21:20 +00:00
Simon J. Gerraty
2cb6de20c6 When processing DPADD, defer application of :tA (realpath)
so we do not lose /.
2013-03-22 01:34:27 +00:00
Simon J. Gerraty
1190d98ed8 Revert the dance for skipping machine qualified dependfile.
We just note when using non-machine qualified dependfile for "host"
and skip update.
2013-03-18 21:29:31 +00:00
Simon J. Gerraty
10cd22b1e6 Make sure we qualify _objroot with trailing / if needed 2013-03-15 20:20:14 +00:00
Simon J. Gerraty
0a7402f278 If .MAKE.DEPENDFILE_DEFAULT is not machine qualified, and we
find oursleves creating a machine qualified .MAKE.DEPENDFILE which
is identical to a default which exists - skip it.

This allows us to create Makefile.depend.host where it matters,
while leveraging Makefile.depend where it is sufficient.
2013-03-12 17:23:23 +00:00
Simon J. Gerraty
c2ec0b5183 Handle multiple M2D_OBJROOTS better 2013-03-04 21:35:49 +00:00
Simon J. Gerraty
4ed4429c63 Latest *dirdeps.mk and meta2deps 2013-02-16 01:16:53 +00:00
Marcel Moolenaar
7750ad47a9 Sync FreeBSD's bmake branch with Juniper's internal bmake branch.
Requested by: Simon Gerraty <sjg@juniper.net>
2012-08-22 19:25:57 +00:00