src/make.c, branch vendor/NetBSD/bmake

Import bmake-20260313

2026-04-06T18:25:05Z

Intersting/relevant changes since bmake-20251111 ChangeLog since bmake-20251111 2026-03-12 Simon J Gerraty * 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 * 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 * 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 * 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 * VERSION (_MAKE_VERSION): 20260222 o mk file update 2026-02-16 Simon J Gerraty * VERSION (_MAKE_VERSION): 20260216 Merge with NetBSD make, pick up o minor cleanups 2026-02-10 Simon J Gerraty * 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 * 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 * 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 * VERSION (_MAKE_VERSION): 20260110 Merge with NetBSD make, pick up o minor cleanups mk/ChangeLog since bmake-20251111 2026-03-12 Simon J Gerraty * install-mk (MK_VERSION): 20260313 * sys.vars.mk: use .MAKE.VERSION M_type can simply use '$x' 2026-02-22 Simon J Gerraty * 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 * meta.autodep.mk (${_DEPENDFILE}): add .NOMETA 2026-01-08 Simon J Gerraty * rust.mk: better accommodation for RUST_LIBS. Set RUST_{LIBS,PROGS}_CARGO_BUILD_OUTPUT_LIST to simplify staging. 2025-12-08 Simon J Gerraty * 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?=:

Import bmake-20250707

2025-07-19T17:08:57Z

Intersting/relevant changes since bmake-20250618 ChangeLog since bmake-20250618 2025-07-07 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250707 Merge with NetBSD make, pick up o cond.c: improve debug log message for 'exists' function. complain about unfinished escape sequences or string literals. 2025-07-04 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250704 Merge with NetBSD make, pick up o make.1: add a DIAGNOSTICS section for make to reference. o main.c: simplify the warning for invalid -J by refering to manual page. 2025-06-30 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250630 Merge with NetBSD make, pick up o consistently use double quotes in error messages o cond.c: if a condition is erroneous, skip the whole .if/.endif o make_malloc.c: in cleanup mode, initialize freshly allocated memory o str.c: error out on an ":M" modifier whose pattern ends with backslash o var.c: fix parsing of modifier parts for :gmtime and :localtime add POSIX $^ support mk/ChangeLog since bmake-20250618 2025-07-04 Simon J Gerraty * prog.mk: .MADE is a special source not a target!

Import bmake-20250618

2025-06-28T02:38:49Z

Intersting/relevant changes since bmake-20250414 ChangeLog since bmake-20250414 2025-06-18 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250618 Merge with NetBSD make, pick up o parse.c: in a warning without location information, print the stack trace 2025-06-15 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250615 Merge with NetBSD make, pick up o add on-demand inter-process stack traces o job.c,meta.c: do not discard empty lines in the output of a command o job.c: add job prefix if necessary in non-default filtered mode o parse.c,var.c: skip inter-process stack trace when MAKE_STACK_TRACE=no 2025-06-12 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250612 Merge with NetBSD make, pick up o use a common style for unexpected error messages o parse.c: add program name to stack traces from sub-makes add quotes to "in directory" line in stack traces o var.c: check variable names for invalid characters when there are no modifiers to apply. This detects and warns about gmake syntax like: $(addprefix -I, $(LIST)) 2025-06-09 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250606 Merge with NetBSD make, pick up o main.c: fix bug in handling of output of children in jobs mode 2025-05-28 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250528 Merge with NetBSD make, pick up o show contents of MAKEFLAGS in the stack trace. o main.c: delay warning about bogus -J flag, if we end up in compat mode before the call to InitMaxJobs, the warning isn't necessary. 2025-05-25 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250525 Merge with NetBSD make, pick up o main.c: set .CURDIR earlier so it can be reported in some errors. 2025-05-20 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250520 Merge with NetBSD make, pick up o rename variables, remove now-redundant comments o job.c: clean up building the shell commands in parallel mode remove timeout for polling in parallel mode o main.c: clean up error message for malformed internal -J option 2025-05-11 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250511 Merge with NetBSD make, pick up o job.c: rename token pool variables to be more descriptive move ContinueJobs further up, to eliminate a forward declaration error out if writing to an internal pipe fails clean up constant names and function names use uniform debug log messages for the token pool in the debug log, replace magic numbers with identifiers o main.c: clean up error message for malformed internal -J option o make.c: replace bitset in trace output with descriptive node attributes o targ.c: add end marker for -dg1, -dg2 and -dg3 debug log o var.c: fix order of error messages in the ":?" modifier 2025-04-25 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250424 Merge with NetBSD make, pick up o cleanup; replace unsigned int with just unsigned Inline the TMPPAT macro, as it is only needed in a single place o move struct Job from job.h to job.c o job.c: group the code for handling the job token pool avoid excessive values of -j o make.c: fix grammar in debug log message mk/ChangeLog since bmake-20250414 2025-05-28 Simon J Gerraty * install-mk (MK_VERSION): 20250528 * add dirdeps2dplibs.mk 2025-05-18 Simon J Gerraty * install-mk (MK_VERSION): 20250518 * meta.autodep.mk (META_FILES): re-work to fix filtering. if OPTIMIZE_OBJECT_META_FILES==yes provide a default META_FILE_OBJ_FILTER that selects a valid .SUFFIX to match *o.meta, there's no guarantee that it will be as simple as .o or .So etc. We have to defer evaluation until the target script is run for any of these filters to have any effect. Use :S,${.OBJDIR}/,, rather than :T incase there are objects in sub-dirs. * lib.mk: leverage ${.SUFFIXES} when setting dependencies. * add UPDATE_DEPENDFILE as a dependent option - follows DIRDEPS_BUILD and use MK_UPDATE_DEPENDFILE as default for UPDATE_DEPENDFILE when we think it should be yes. This allows override with -DWITH[OUT]_UPDATE_DEPENDFILE without overriding UPDATE_DEPENDFILE directly - which can lead to trouble. 2025-05-16 Simon J Gerraty * install-mk (MK_VERSION): 20250515 * meta2deps.py: resolve the target of a Move or Link first and track the last path resolved, then if the src is a relative path we can easily use that last path to resolve the src correctly. * meta2deps.sh: for a Move or Link add the dir of target path to the list used to resolve the src path.

Import bmake-20240625

2024-06-29T00:16:32Z

Intersting/relevant changes since bmake-20240520 ChangeLog since bmake-20240520 2024-06-25 Simon J Gerraty * VERSION (_MAKE_VERSION): 20240625 Merge with NetBSD make, pick up o job.c: ensure shellPath is always duped, avoid upsetting free() 2024-06-16 Simon J Gerraty * VERSION (_MAKE_VERSION): 20240616 Merge with NetBSD make, pick up o clean up collection of context information for error messages o in warnings, move the word "warning" to the front o var.c: throw an error on attempt to override an internal read-only variable 2024-06-10 Simon J Gerraty * VERSION (_MAKE_VERSION): 20240610 Merge with NetBSD make, pick up o for.c: remove redundant shortcut for building the .for loop body 2024-06-02 Simon J Gerraty * VERSION (_MAKE_VERSION): 20240602 Merge with NetBSD make, pick up o rename some VarEvalMode constants to better match debug names. o var.c: avoid out-of-bounds read when parsing indirect modifiers. 2024-06-01 Simon J Gerraty * VERSION (_MAKE_VERSION): 20240601 Merge with NetBSD make, pick up o add .export-all rather than allow .export with no argument which can happen accidentally. o if lua is available, run check-expect.lua after unit-tests o main.c: use snprintf rather than strncpy fix memory leak when purging realpath cache. 2024-05-28 Simon J Gerraty * VERSION (_MAKE_VERSION): 20240528 Merge with NetBSD make, pick up o fix a number of memory leaks o replace magic numbers with POSIX FILENO constants o hash.c: remove dead code from HashTable_DeleteEntry o main.c: when complaining about unusable .OBJDIR call PrintOnError if MAKE_DEBUG_OBJDIR_CHECK_WRITABLE is true. o parse.c: use fewer technical terms in debug message for dependency mk/ChangeLog since bmake-20240520 2024-06-22 Simon J Gerraty * install-mk (MK_VERSION): 20240616 * dirdeps.mk: apply DEP_DIRDEPS_BUILD_DIR_FILTER after we have computed build dirs, since some filters cannot be easily expressed via DEP_DIRDEPS_FILTER. 2024-05-31 Simon J Gerraty * dirdeps.mk: move reset of DIRDEPS_EXPORT_VARS until after we a finished with it if building a cache.

Import bmake-20240108

2024-01-14T01:16:25Z

Interesting/relevant changes since bmake-20230909 * VERSION (_MAKE_VERSION): 20240106 Merge with NetBSD make, pick up o fix duplicate progname when reporting an unknown target o unit tests for Cmd_Exec using temp file * VERSION (_MAKE_VERSION): 20240105 Merge with NetBSD make, pick up o main.c: Cmd_Exec write cmd to a file if too big avoid blowing commandline/env limits * VERSION (_MAKE_VERSION): 20240101 o util.c: flesh out more of strftime * configure.in: add --with-bmake-strftime it is not a full implementation but enough to pass all the unit-tests. * parse.c: LoadFile do not append \n to empty buffer. * VERSION (_MAKE_VERSION): 20231230 Merge with NetBSD make, pick up o simplify memory allocation for string buffers o fix declared types of list nodes o suff.c: clean up freeing of suffixes o var.c: simplify debug message for the ':@var@...@' modifier clean up variable handling * VERSION (_MAKE_VERSION): 20231226 Merge with NetBSD make, pick up o compat.c: ensure make's output is correctly ordered with that of the target when not going to a tty o main.c: check for shellPath whether to call Shell_Init() * VERSION (_MAKE_VERSION): 20231224 Merge with NetBSD make, pick up o compat.c: check for shellPath whether to call Shell_Init() tweak the unit test to detect the bug thus fixed. o make.1: do not claim .SHELL is only used by jobs mode. * VERSION (_MAKE_VERSION): 20231220 Merge with NetBSD make, pick up o str.c: speed up pattern matching in the ':M' modifier o var.c: fix confusing debug logging when deleting a variable use consistent debug messages style when ignoring variables * VERSION (_MAKE_VERSION): 20231210 Merge with NetBSD make, pick up o var.c: avoid segfault on empty :C match expression explain in debug log why variable assignment is ignored. * VERSION (_MAKE_VERSION): 20231208 Merge with NetBSD make, pick up o var.c: ensure fromCmd is set correctly for variables set on command line. * VERSION (_MAKE_VERSION): 20231124 Merge with NetBSD make, pick up o main.c: cleanup processing of -j fix lint warning about strchr o var.c: more accurate error message for invalid ':mtime' argument cleanup :[...] modifier avoid reading beyond substring when comparing o unit-tests cover all cases of :mtime, test and explain exporting of variables o cleanup comments * bsd.after-import.mk (ECHO_TAG): FreeBSD no longer uses $FreeBSD$ tag, so avoid adding it. mk/ChangeLog since bmake-20230909 * dirdeps.mk: for MAKE_VERSION 20240105 we do not have the same limits on command line length, so skip export of lists to env. * jobs.mk: avoid C suffix in JOB_MAX_C if factor is floating point. This keeps JOB_MAX numeric incase another makefile does comparisons. * gendirdeps.mk: if META_XTRAS is passed to us, add to META_FILES

Import bmake-20230414

2023-04-24T23:44:30Z

Relevant/interesting changes: * make.1: document seemingly unexplained Error code 6. o compat.c: CompatDeleteTarget skip .PHONY targets to be consistent with JobDeleteTarget. o job.c: fix memory leak in handling sysv :from=to modifiers o unit tests for .MAKE.META.IGNORE_{FILTER,PATHS,PATTERNS} o var.c: fix parsing of unevaluated subexpressions with unbalanced '{}' o cond.c: reduce complexity of evaluating expressions

Import bmake-20230126

2023-01-28T00:23:54Z

Relevant/interesting changes (see ChangeLog for more): o variables like .newline and .MAKE.{GID,PID,PPID,UID} should be read-only. o .[NO]READONLY: for control of read-only variables o .SYSPATH: for controlling the path searched for makefiles o allow for white-space between command specifiers @+- o add more details to warning 'Extra targets ignored' o make.1: sync list of built-in variables with reality sort list of built-in variables o cond.c: add more details to error message for numeric comparison o job.c: fix handling of null bytes in output o Allow .break to terminate a .for loop early o var.c: fix out-of-bounds errors when parsing o fix exit status for '-q' (since 1994)

Import bmake-20220724

2022-07-26T15:52:53Z

Relevant/interesting changes: o parse.c: fix out-of-bounds read when parsing an invalid line https://bugs.freebsd.org/265119 fix memory leak in wildcard targets and sources fix off-by-one error in buffer for .WAIT nodes o allow to randomize build order of targets .MAKE.MODE += randomize-targets can help uncover dependency bugs

Import bmake-20220204

2022-02-05T20:03:50Z

Features of interest: Allow setting target local variables (similar to gmake) In META_MODE .MAKE.META.CMP_FILTER can be used for filtering commands before comparion. contrib/bmake/mk/cc-wrap.mk is an example of using these See ChangeLog for the gory details.

Import bmake-20211212

2021-12-18T07:27:22Z

Relevant changes see ChangeLog for details: Add support for ${.SUFFIXES} as read-only variable. Fix memory leak in cond.c Punt on write errors - ENOSPC etc. Lots of code refactoring, rework to reduce memory allocations. More unit-tests.