diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2026-04-06 18:25:05 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2026-04-06 18:25:05 +0000 |
| commit | fe271bdb43cf88ee129d94c0e286fe618fd28e89 (patch) | |
| tree | f8a53c5b636b2af4eaa7ac94683cb00033588454 /unit-tests/varname-make_stack_trace.exp | |
| parent | 638c66de4a0faa4c2e815e81cd4021c2387c7e0f (diff) | |
Import bmake-20260313vendor/NetBSD/bmake/20260313
Intersting/relevant changes since bmake-20251111
ChangeLog since bmake-20251111
2026-03-12 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20260313
Merge with NetBSD make, pick up
o make: ensure .MAKE.SAVE_DOLLARS is initialized so makefiles like
sys.vars.mk can test its value to know how to deal with macros
that need to save '$' during ':='.
* Makefile: default MAKE_SAVE_DOLLARS_DEFAULT to "no"
for traditional behavior.
2026-03-10 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20260310
Merge with NetBSD make, pick up
o unit-tests ensure TEST_MAKE is absolute path
and tests that make symlink for ${MAKE} can run in parallel.
2026-03-03 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20260303
Merge with NetBSD make, pick up
o job.c: MaybeSubMake: Look for expansion of ${.MAKE}
and if necessary its basename, and only match if at start of line
or preceded by space.
2026-02-28 Simon J Gerraty <sjg@beast.crufty.net>
* Makefile: mark ${PROG} and ${OBJS} as .META
MaybeSubMake will otherwise mistake them for sub-makes
* VERSION (_MAKE_VERSION): 20260301
Merge with NetBSD make, pick up
o job.c: MaybeSubMake: skip control chars [@+-] at start of line
when checking for ${MAKE}
2026-02-22 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20260222
o mk file update
2026-02-16 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20260216
Merge with NetBSD make, pick up
o minor cleanups
2026-02-10 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20260210
Merge with NetBSD make, pick up
o document that multiple variables can be set on command line.
o move MaybeSubMake to job.c so it can be called on expanded
commands for more accuracy and less overhead.
o main.c: set .MAKE.VERSION as read-only.
* unit-tests/opt-{chdir,where-am-i}.mk: use MAKEOBJDIRPREFIX=/
to avoid tripping over an unreadable /usr/obj
2026-02-04 Simon J Gerraty <sjg@beast.crufty.net>
* unit-tests/varname-make_stack_trace.mk: for
FreeBSD and similar set .MAKE.ALWAYS_PASS_JOB_QUEUE=no
to ensure we get the expected errors.
* VERSION (_MAKE_VERSION): 20260202
Merge with NetBSD make, pick up
o on error avoid duplicate stack trace to stderr
2026-01-11 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20260111
Merge with NetBSD make, pick up
o var.c: add explicit check for empty re as not all
regex libs throw an error as expected, in this case.
2026-01-10 Simon J Gerraty <sjg@beast.crufty.net>
* VERSION (_MAKE_VERSION): 20260110
Merge with NetBSD make, pick up
o minor cleanups
mk/ChangeLog since bmake-20251111
2026-03-12 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20260313
* sys.vars.mk: use .MAKE.VERSION
M_type can simply use '$x'
2026-02-22 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20260222
* dirdeps.mk, sys.mk: add dependent option
UPDATE_DIRDEPS_CACHE/DIRDEPS_CACHE.
It can be useful to use -DWITHOUT_UPDATE_DIRDEPS_CACHE to
temporarily treat dynamic DIRDEPS_CACHE as static.
2026-01-10 Simon J Gerraty <sjg@beast.crufty.net>
* meta.autodep.mk (${_DEPENDFILE}): add .NOMETA
2026-01-08 Simon J Gerraty <sjg@beast.crufty.net>
* rust.mk: better accommodation for RUST_LIBS.
Set RUST_{LIBS,PROGS}_CARGO_BUILD_OUTPUT_LIST to
simplify staging.
2025-12-08 Simon J Gerraty <sjg@beast.crufty.net>
* install-mk (MK_VERSION): 20251207
* sys.vars.mk: replace MAKE_POSIX_SHELL usage with isPOSIX_SHELL
Using ${isPOSIX_SHELL:U:Nfalse} provides a boolean for make
and ${isPOSIX_SHELL:Ufalse} does the same for target scripts.
Both will be false if isPOSIX_SHELL is not set or set to false.
This has the advantage that if only POSIX shells are expected
sys.mk (or something it includes) can simply do isPOSIX_SHELL?=:
Diffstat (limited to 'unit-tests/varname-make_stack_trace.exp')
| -rw-r--r-- | unit-tests/varname-make_stack_trace.exp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/unit-tests/varname-make_stack_trace.exp b/unit-tests/varname-make_stack_trace.exp index c0f46cc5aa1e..5de66aa8bb8f 100644 --- a/unit-tests/varname-make_stack_trace.exp +++ b/unit-tests/varname-make_stack_trace.exp @@ -1,7 +1,7 @@ make: Unknown modifier ":Z" while evaluating "${:Z}" with value "" in command "@echo ${:Z}" - in target "provoke-error" + in target "provoke-error" from varname-make_stack_trace.mk:42 in make[2] in directory "<curdir>" *** Error code 2 (continuing) @@ -10,7 +10,7 @@ make: stopped making "disabled-compat" in unit-tests make: Unknown modifier ":Z" while evaluating "${:Z}" with value "" in command "@echo ${:Z}" - in target "provoke-error" + in target "provoke-error" from varname-make_stack_trace.mk:42 in make[2] in directory "<curdir>" *** [disabled-parallel] Error code 2 @@ -18,10 +18,10 @@ make: stopped making "disabled-parallel" in unit-tests make: Unknown modifier ":Z" while evaluating "${:Z}" with value "" in command "@echo ${:Z}" - in target "provoke-error" + in target "provoke-error" from varname-make_stack_trace.mk:42 in make[2] in directory "<curdir>" in command "make -f varname-make_stack_trace.mk provoke-error" - in target "enabled-compat" + in target "enabled-compat" from varname-make_stack_trace.mk:35 in make[1] in directory "<curdir>" *** Error code 2 (continuing) @@ -30,11 +30,21 @@ make: stopped making "enabled-compat" in unit-tests make: Unknown modifier ":Z" while evaluating "${:Z}" with value "" in command "@echo ${:Z}" - in target "provoke-error" + in target "provoke-error" from varname-make_stack_trace.mk:42 in make[2] in directory "<curdir>" - in target "enabled-parallel" + in target "enabled-parallel" from varname-make_stack_trace.mk:39 in make[1] in directory "<curdir>" *** [enabled-parallel] Error code 2 make: stopped making "enabled-parallel" in unit-tests +.make[5]: warning: Invalid internal option "-J" in "<curdir>"; see the manual page + in .make[5] in directory "<curdir>" + in target "multi-stage-4" from varname-make_stack_trace.mk:56 + in make[4] in directory "<curdir>" + in target "multi-stage-3" from varname-make_stack_trace.mk:54 + in make[3] in directory "<curdir>" + in target "multi-stage-2" from varname-make_stack_trace.mk:52 + in make[2] in directory "<curdir>" + in target "multi-stage-1" from varname-make_stack_trace.mk:50 + in make[1] in directory "<curdir>" exit status 0 |
