git: 226192822cdd - main - Merge bmake-20240711
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 20 Jul 2024 19:46:54 UTC
The branch main has been updated by sjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=226192822cddc30cacecd55bccb48f39c653058c
commit 226192822cddc30cacecd55bccb48f39c653058c
Merge: 90818083d795 84691af93185
Author: Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2024-07-20 19:43:11 +0000
Commit: Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2024-07-20 19:45:48 +0000
Merge bmake-20240711
Merge commit '84691af93185c692058ba55fa81a04103f5bf71b'
contrib/bmake/ChangeLog | 83 ++
contrib/bmake/FILES | 2 +
contrib/bmake/VERSION | 2 +-
contrib/bmake/arch.c | 10 +-
contrib/bmake/bmake.1 | 7 +-
contrib/bmake/bmake.cat1 | 73 +-
contrib/bmake/compat.c | 28 +-
contrib/bmake/cond.c | 8 +-
contrib/bmake/config.h.in | 137 +-
contrib/bmake/configure | 1338 +++++++++++---------
contrib/bmake/configure.in | 13 +-
contrib/bmake/dir.c | 8 +-
contrib/bmake/dir.h | 4 +-
contrib/bmake/hash.c | 33 +-
contrib/bmake/hash.h | 5 +-
contrib/bmake/job.c | 18 +-
contrib/bmake/job.h | 6 +-
contrib/bmake/main.c | 127 +-
contrib/bmake/make.1 | 7 +-
contrib/bmake/make.h | 20 +-
contrib/bmake/meta.c | 3 +
contrib/bmake/mk/install-mk | 0
contrib/bmake/parse.c | 31 +-
contrib/bmake/str.c | 12 +-
contrib/bmake/str.h | 4 +-
contrib/bmake/suff.c | 9 +-
contrib/bmake/targ.c | 15 +-
contrib/bmake/unit-tests/Makefile | 32 +-
contrib/bmake/unit-tests/cmd-errors-jobs.exp | 6 +-
contrib/bmake/unit-tests/cmd-errors-jobs.mk | 17 +-
contrib/bmake/unit-tests/cmd-errors-lint.exp | 4 +-
contrib/bmake/unit-tests/cmd-errors-lint.mk | 23 +-
contrib/bmake/unit-tests/cmd-errors.exp | 6 +-
contrib/bmake/unit-tests/cmd-errors.mk | 21 +-
contrib/bmake/unit-tests/compat-error.exp | 2 +-
contrib/bmake/unit-tests/cond-cmp-numeric.exp | 2 +-
contrib/bmake/unit-tests/cond-func-defined.exp | 2 +-
contrib/bmake/unit-tests/cond-func.exp | 12 +-
contrib/bmake/unit-tests/cond-func.mk | 13 +-
contrib/bmake/unit-tests/cond-late.exp | 5 +-
contrib/bmake/unit-tests/cond-late.mk | 14 +-
contrib/bmake/unit-tests/cond-op-and.exp | 12 +-
contrib/bmake/unit-tests/cond-op-and.mk | 27 +-
contrib/bmake/unit-tests/cond-op-not.exp | 2 +-
contrib/bmake/unit-tests/cond-op-or.exp | 12 +-
contrib/bmake/unit-tests/cond-op-or.mk | 53 +-
contrib/bmake/unit-tests/cond-op-parentheses.exp | 2 +-
contrib/bmake/unit-tests/cond-op.exp | 2 +-
contrib/bmake/unit-tests/cond-short.exp | 2 +-
contrib/bmake/unit-tests/cond-token-number.exp | 2 +-
contrib/bmake/unit-tests/cond-token-string.exp | 4 +-
contrib/bmake/unit-tests/cond-token-string.mk | 4 +-
contrib/bmake/unit-tests/dep-op-missing.exp | 1 +
contrib/bmake/unit-tests/dep-percent.exp | 2 +-
contrib/bmake/unit-tests/dep-var.exp | 2 +-
contrib/bmake/unit-tests/dep.exp | 2 +-
contrib/bmake/unit-tests/depsrc-ignore.exp | 2 +-
.../unit-tests/deptgt-begin-fail-indirect.exp | 2 +-
contrib/bmake/unit-tests/deptgt-begin-fail.exp | 2 +-
.../bmake/unit-tests/deptgt-delete_on_error.exp | 14 +-
contrib/bmake/unit-tests/deptgt-end-fail-all.exp | 2 +-
.../bmake/unit-tests/deptgt-end-fail-indirect.exp | 2 +-
contrib/bmake/unit-tests/deptgt-end-fail.exp | 30 +-
contrib/bmake/unit-tests/deptgt-error.exp | 2 +-
contrib/bmake/unit-tests/deptgt-ignore.exp | 2 +-
contrib/bmake/unit-tests/deptgt-path-suffix.exp | 2 +-
contrib/bmake/unit-tests/deptgt.exp | 5 +-
contrib/bmake/unit-tests/deptgt.mk | 21 +-
contrib/bmake/unit-tests/directive-dinclude.exp | 3 +-
contrib/bmake/unit-tests/directive-elif.exp | 2 +-
contrib/bmake/unit-tests/directive-else.exp | 2 +-
.../bmake/unit-tests/directive-export-gmake.exp | 1 +
contrib/bmake/unit-tests/directive-for-break.exp | 1 +
contrib/bmake/unit-tests/directive-for-errors.exp | 16 +-
contrib/bmake/unit-tests/directive-for-errors.mk | 18 +-
contrib/bmake/unit-tests/directive-for-escape.exp | 114 +-
contrib/bmake/unit-tests/directive-for-escape.mk | 96 +-
.../unit-tests/directive-for-generating-endif.exp | 5 +-
contrib/bmake/unit-tests/directive-for-if.exp | 5 +-
contrib/bmake/unit-tests/directive-for-null.exp | 3 +-
contrib/bmake/unit-tests/directive-for.exp | 42 +-
contrib/bmake/unit-tests/directive-for.mk | 42 +-
.../bmake/unit-tests/directive-hyphen-include.exp | 3 +-
contrib/bmake/unit-tests/directive-ifmake.exp | 2 +-
.../bmake/unit-tests/directive-include-fatal.exp | 2 +-
contrib/bmake/unit-tests/directive-include.exp | 4 +-
contrib/bmake/unit-tests/directive-include.mk | 4 +-
contrib/bmake/unit-tests/directive-info.exp | 2 +-
contrib/bmake/unit-tests/directive-sinclude.exp | 3 +-
contrib/bmake/unit-tests/directive-undef.exp | 4 +-
contrib/bmake/unit-tests/directive-undef.mk | 4 +-
.../bmake/unit-tests/directive-unexport-env.exp | 2 +-
contrib/bmake/unit-tests/directive-warning.exp | 2 +-
contrib/bmake/unit-tests/directive.exp | 2 +-
contrib/bmake/unit-tests/doterror.exp | 2 +-
.../bmake/unit-tests/jobs-empty-commands-error.exp | 2 +-
contrib/bmake/unit-tests/jobs-error-indirect.exp | 4 +-
.../bmake/unit-tests/jobs-error-nested-make.exp | 6 +-
contrib/bmake/unit-tests/jobs-error-nested.exp | 8 +-
contrib/bmake/unit-tests/lint.exp | 2 +-
contrib/bmake/unit-tests/moderrs.exp | 110 +-
contrib/bmake/unit-tests/moderrs.mk | 78 +-
contrib/bmake/unit-tests/opt-debug-errors-jobs.exp | 12 +-
contrib/bmake/unit-tests/opt-debug-errors.exp | 2 +-
contrib/bmake/unit-tests/opt-debug-file.exp | 8 +-
contrib/bmake/unit-tests/opt-debug-file.mk | 15 +-
contrib/bmake/unit-tests/opt-debug-graph2.exp | 2 +-
contrib/bmake/unit-tests/opt-debug-graph3.exp | 2 +-
contrib/bmake/unit-tests/opt-debug-hash.exp | 4 +-
contrib/bmake/unit-tests/opt-debug-lint.exp | 6 +-
contrib/bmake/unit-tests/opt-debug-lint.mk | 8 +-
contrib/bmake/unit-tests/opt-file.exp | 3 +-
.../bmake/unit-tests/opt-keep-going-indirect.exp | 8 +-
.../bmake/unit-tests/opt-keep-going-multiple.exp | 2 +-
contrib/bmake/unit-tests/opt-keep-going.exp | 2 +-
.../bmake/unit-tests/opt-warnings-as-errors.exp | 2 +-
contrib/bmake/unit-tests/opt.exp | 2 +-
contrib/bmake/unit-tests/parse.exp | 2 +-
contrib/bmake/unit-tests/posix.exp | 2 +-
contrib/bmake/unit-tests/sh-jobs.exp | 2 +-
contrib/bmake/unit-tests/suff-add-later.exp | 2 +-
contrib/bmake/unit-tests/suff-clear-regular.exp | 2 +-
contrib/bmake/unit-tests/suff-clear-single.exp | 2 +-
contrib/bmake/unit-tests/suff-main-several.exp | 2 +-
contrib/bmake/unit-tests/suff-self.exp | 2 +-
.../bmake/unit-tests/suff-transform-endless.exp | 2 +-
contrib/bmake/unit-tests/suff-transform-expand.exp | 2 +-
contrib/bmake/unit-tests/suff-transform-select.exp | 2 +-
contrib/bmake/unit-tests/suff-use.exp | 2 +-
contrib/bmake/unit-tests/use-inference.exp | 2 +-
contrib/bmake/unit-tests/var-eval-short.exp | 4 +-
contrib/bmake/unit-tests/var-eval-short.mk | 4 +-
contrib/bmake/unit-tests/var-op-assign.exp | 2 +-
contrib/bmake/unit-tests/var-op-expand.exp | 6 +-
contrib/bmake/unit-tests/var-op-expand.mk | 6 +-
contrib/bmake/unit-tests/var-op-shell.exp | 6 +-
contrib/bmake/unit-tests/var-op-shell.mk | 16 +-
contrib/bmake/unit-tests/var-recursive.exp | 5 +-
contrib/bmake/unit-tests/vardebug.exp | 2 +-
contrib/bmake/unit-tests/vardebug.mk | 4 +-
contrib/bmake/unit-tests/varmisc.exp | 8 +-
contrib/bmake/unit-tests/varmisc.mk | 13 +-
contrib/bmake/unit-tests/varmod-assign-shell.exp | 12 +-
contrib/bmake/unit-tests/varmod-assign-shell.mk | 18 +-
contrib/bmake/unit-tests/varmod-assign.exp | 12 +-
contrib/bmake/unit-tests/varmod-assign.mk | 7 +-
contrib/bmake/unit-tests/varmod-edge.exp | 33 +-
contrib/bmake/unit-tests/varmod-edge.mk | 231 ++--
contrib/bmake/unit-tests/varmod-gmtime.exp | 12 +-
contrib/bmake/unit-tests/varmod-gmtime.mk | 12 +-
contrib/bmake/unit-tests/varmod-hash.exp | 8 +-
contrib/bmake/unit-tests/varmod-ifelse.exp | 52 +-
contrib/bmake/unit-tests/varmod-ifelse.mk | 22 +-
contrib/bmake/unit-tests/varmod-indirect.exp | 8 +-
contrib/bmake/unit-tests/varmod-indirect.mk | 10 +-
contrib/bmake/unit-tests/varmod-localtime.exp | 12 +-
contrib/bmake/unit-tests/varmod-localtime.mk | 12 +-
contrib/bmake/unit-tests/varmod-loop-delete.exp | 4 +-
contrib/bmake/unit-tests/varmod-loop-delete.mk | 4 +-
contrib/bmake/unit-tests/varmod-loop-varname.exp | 10 +-
contrib/bmake/unit-tests/varmod-loop-varname.mk | 10 +-
contrib/bmake/unit-tests/varmod-match-escape.exp | 10 +-
contrib/bmake/unit-tests/varmod-match-escape.mk | 8 +-
contrib/bmake/unit-tests/varmod-match.exp | 20 +-
contrib/bmake/unit-tests/varmod-match.mk | 22 +-
contrib/bmake/unit-tests/varmod-mtime.exp | 12 +-
contrib/bmake/unit-tests/varmod-mtime.mk | 14 +-
contrib/bmake/unit-tests/varmod-order.exp | 48 +-
contrib/bmake/unit-tests/varmod-order.mk | 32 +-
contrib/bmake/unit-tests/varmod-range.exp | 12 +-
contrib/bmake/unit-tests/varmod-range.mk | 12 +-
contrib/bmake/unit-tests/varmod-select-words.exp | 26 +-
contrib/bmake/unit-tests/varmod-shell.exp | 14 +-
contrib/bmake/unit-tests/varmod-shell.mk | 14 +-
contrib/bmake/unit-tests/varmod-subst-regex.exp | 30 +-
contrib/bmake/unit-tests/varmod-subst.exp | 4 +-
contrib/bmake/unit-tests/varmod-sun-shell.exp | 16 +-
contrib/bmake/unit-tests/varmod-sun-shell.mk | 14 +-
contrib/bmake/unit-tests/varmod-sysv.exp | 10 +-
contrib/bmake/unit-tests/varmod-sysv.mk | 10 +-
contrib/bmake/unit-tests/varmod-to-separator.exp | 44 +-
contrib/bmake/unit-tests/varmod-to-separator.mk | 23 +-
contrib/bmake/unit-tests/varmod-to-title.exp | 1 +
contrib/bmake/unit-tests/varmod-to-title.mk | 31 +
contrib/bmake/unit-tests/varmod.exp | 54 +-
contrib/bmake/unit-tests/varmod.mk | 38 +-
contrib/bmake/unit-tests/varname-dot-newline.exp | 5 +-
.../varname-make_print_var_on_error-jobs.exp | 2 +-
.../unit-tests/varname-make_print_var_on_error.exp | 2 +-
contrib/bmake/unit-tests/varname.exp | 2 +-
contrib/bmake/unit-tests/varparse-errors.exp | 44 +-
contrib/bmake/unit-tests/varparse-errors.mk | 26 +-
contrib/bmake/util.c | 6 +-
contrib/bmake/var.c | 165 +--
usr.bin/bmake/Makefile.config | 2 +-
usr.bin/bmake/config.h | 141 ++-
usr.bin/bmake/unit-tests/Makefile | 32 +-
197 files changed, 2564 insertions(+), 2024 deletions(-)
diff --cc contrib/bmake/mk/install-mk
index bb150e3041a3,bb150e3041a3..bb150e3041a3
mode 100644,100755..100755
--- a/contrib/bmake/mk/install-mk
+++ b/contrib/bmake/mk/install-mk
diff --cc contrib/bmake/unit-tests/varmod-to-title.exp
index 000000000000,39a9383953dd..39a9383953dd
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/varmod-to-title.exp
+++ b/contrib/bmake/unit-tests/varmod-to-title.exp
diff --cc contrib/bmake/unit-tests/varmod-to-title.mk
index 000000000000,f99e5441a8fb..f99e5441a8fb
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/varmod-to-title.mk
+++ b/contrib/bmake/unit-tests/varmod-to-title.mk
diff --cc usr.bin/bmake/Makefile.config
index 1d9a6a2880ea,000000000000..75ceb4a50e15
mode 100644,000000..100644
--- a/usr.bin/bmake/Makefile.config
+++ b/usr.bin/bmake/Makefile.config
@@@ -1,28 -1,0 +1,28 @@@
+# This is a generated file, do NOT edit!
+# See contrib/bmake/bsd.after-import.mk
+#
+
+SRCTOP?= ${.CURDIR:H:H}
+
+# things set by configure
+
- _MAKE_VERSION?=20240625
++_MAKE_VERSION?=20240711
+
+prefix?= /usr
+srcdir= ${SRCTOP}/contrib/bmake
+CC?= cc
+MAKE_OS?=
+DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk
+
+EGREP = egrep
+CPPFLAGS+=
+CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H
+LDFLAGS+=
+LIBOBJS+= ${LIBOBJDIR}stresep$U.o
+LDADD+=
+USE_META?= yes
+USE_FILEMON?= dev
+FILEMON_H?= /usr/include/dev/filemon/filemon.h
+BMAKE_PATH_MAX?= 1024
+# used if MAXPATHLEN not defined
+CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}
diff --cc usr.bin/bmake/config.h
index 3ca313216962,000000000000..33aed8f160c8
mode 100644,000000..100644
--- a/usr.bin/bmake/config.h
+++ b/usr.bin/bmake/config.h
@@@ -1,448 -1,0 +1,449 @@@
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.in by autoheader. */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Path of default shell */
+/* #undef DEFSHELL_CUSTOM */
+
+/* Shell spec to use by default */
+/* #undef DEFSHELL_INDEX */
+
+/* Path of default shell */
+/* #undef DEFSHELL_PATH */
+
+/* Define to 1 if you have the <ar.h> header file. */
+#define HAVE_AR_H 1
+
- /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
++/* Define to 1 if you have the declaration of 'sys_siglist', and to 0 if you
+ don't. */
+#define HAVE_DECL_SYS_SIGLIST 1
+
- /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
++/* Define to 1 if you have the <dirent.h> header file, and it defines 'DIR'.
+ */
+#define HAVE_DIRENT_H 1
+
- /* Define to 1 if you have the `dirname' function. */
++/* Define to 1 if you have the 'dirname' function. */
+#define HAVE_DIRNAME 1
+
- /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
++/* Define to 1 if you don't have 'vprintf' but do have '_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
- /* Define to 1 if you have the `err' function. */
++/* Define to 1 if you have the 'err' function. */
+#define HAVE_ERR 1
+
- /* Define to 1 if you have the `errx' function. */
++/* Define to 1 if you have the 'errx' function. */
+#define HAVE_ERRX 1
+
+/* Define to 1 if you have the <err.h> header file. */
+#define HAVE_ERR_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
- /* Define to 1 if you have the `fork' function. */
++/* Define to 1 if you have the 'fork' function. */
+#define HAVE_FORK 1
+
- /* Define to 1 if you have the `getcwd' function. */
++/* Define to 1 if you have the 'getcwd' function. */
+#define HAVE_GETCWD 1
+
- /* Define to 1 if you have the `getenv' function. */
++/* Define to 1 if you have the 'getenv' function. */
+#define HAVE_GETENV 1
+
- /* Define to 1 if you have the `getopt' function. */
++/* Define to 1 if you have the 'getopt' function. */
+#define HAVE_GETOPT 1
+
- /* Define to 1 if you have the `getwd' function. */
++/* Define to 1 if you have the 'getwd' function. */
+#define HAVE_GETWD 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
- /* Define to 1 if you have the `killpg' function. */
++/* Define to 1 if you have the 'killpg' function. */
+#define HAVE_KILLPG 1
+
+/* Define to 1 if you have the <libgen.h> header file. */
+#define HAVE_LIBGEN_H 1
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
- /* Define to 1 if the system has the type `long long int'. */
++/* Define to 1 if the system has the type 'long long int'. */
+#define HAVE_LONG_LONG_INT 1
+
+/* Define to 1 if you have the <minix/config.h> header file. */
+/* #undef HAVE_MINIX_CONFIG_H */
+
- /* Define to 1 if you have the `mmap' function. */
- #define HAVE_MMAP 1
-
- /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
++/* Define to 1 if you have the <ndir.h> header file, and it defines 'DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define to 1 if you have the <paths.h> header file. */
+#define HAVE_PATHS_H 1
+
+/* Define to 1 if you have the <poll.h> header file. */
+#define HAVE_POLL_H 1
+
- /* Define to 1 if you have the `putenv' function. */
++/* Define to 1 if you have the 'putenv' function. */
+#define HAVE_PUTENV 1
+
+/* Define to 1 if you have the <ranlib.h> header file. */
+#define HAVE_RANLIB_H 1
+
- /* Define to 1 if you have the `realpath' function. */
++/* Define to 1 if you have the 'realpath' function. */
+#define HAVE_REALPATH 1
+
+/* Define to 1 if you have the <regex.h> header file. */
+#define HAVE_REGEX_H 1
+
- /* Define to 1 if you have the `select' function. */
++/* Define to 1 if you have the 'select' function. */
+#define HAVE_SELECT 1
+
- /* Define to 1 if you have the `setenv' function. */
++/* Define to 1 if you have the 'setenv' function. */
+#define HAVE_SETENV 1
+
- /* Define to 1 if you have the `setpgid' function. */
++/* Define to 1 if you have the 'setpgid' function. */
+#define HAVE_SETPGID 1
+
- /* Define to 1 if you have the `setrlimit' function. */
++/* Define to 1 if you have the 'setrlimit' function. */
+#define HAVE_SETRLIMIT 1
+
- /* Define to 1 if you have the `setsid' function. */
++/* Define to 1 if you have the 'setsid' function. */
+#define HAVE_SETSID 1
+
- /* Define to 1 if you have the `sigaction' function. */
++/* Define to 1 if you have the 'sigaction' function. */
+#define HAVE_SIGACTION 1
+
- /* Define to 1 if you have the `sigaddset' function. */
++/* Define to 1 if you have the 'sigaddset' function. */
+#define HAVE_SIGADDSET 1
+
- /* Define to 1 if you have the `sigpending' function. */
++/* Define to 1 if you have the 'sigpending' function. */
+#define HAVE_SIGPENDING 1
+
- /* Define to 1 if you have the `sigprocmask' function. */
++/* Define to 1 if you have the 'sigprocmask' function. */
+#define HAVE_SIGPROCMASK 1
+
- /* Define to 1 if you have the `sigsetmask' function. */
++/* Define to 1 if you have the 'sigsetmask' function. */
+#define HAVE_SIGSETMASK 1
+
- /* Define to 1 if you have the `sigsuspend' function. */
++/* Define to 1 if you have the 'sigsuspend' function. */
+#define HAVE_SIGSUSPEND 1
+
- /* Define to 1 if you have the `sigvec' function. */
++/* Define to 1 if you have the 'sigvec' function. */
+#define HAVE_SIGVEC 1
+
- /* Define to 1 if the system has the type `sig_atomic_t'. */
++/* Define to 1 if the system has the type 'sig_atomic_t'. */
+#define HAVE_SIG_ATOMIC_T 1
+
- /* Define to 1 if you have the `snprintf' function. */
++/* Define to 1 if you have the 'snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
- /* Define to 1 if you have the `strerror' function. */
++/* Define to 1 if you have the 'strerror' function. */
+#define HAVE_STRERROR 1
+
- /* Define to 1 if you have the `stresep' function. */
++/* Define to 1 if you have the 'stresep' function. */
+/* #undef HAVE_STRESEP */
+
- /* Define to 1 if you have the `strftime' function. */
++/* Define to 1 if you have the 'strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
- /* Define to 1 if you have the `strlcpy' function. */
++/* Define to 1 if you have the 'strlcpy' function. */
+#define HAVE_STRLCPY 1
+
- /* Define to 1 if you have the `strsep' function. */
++/* Define to 1 if you have the 'strsep' function. */
+#define HAVE_STRSEP 1
+
- /* Define to 1 if you have the `strtod' function. */
++/* Define to 1 if you have the 'strtod' function. */
+#define HAVE_STRTOD 1
+
- /* Define to 1 if you have the `strtol' function. */
++/* Define to 1 if you have the 'strtol' function. */
+#define HAVE_STRTOL 1
+
- /* Define to 1 if you have the `strtoll' function. */
++/* Define to 1 if you have the 'strtoll' function. */
+#define HAVE_STRTOLL 1
+
- /* Define to 1 if you have the `strtoul' function. */
++/* Define to 1 if you have the 'strtoul' function. */
+#define HAVE_STRTOUL 1
+
- /* Define to 1 if you have the `sysctl' function. */
++/* Define to 1 if you have the 'sysctl' function. */
+#define HAVE_SYSCTL 1
+
- /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
++/* Define to 1 if you have the <sys/dir.h> header file, and it defines 'DIR'.
+ */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#define HAVE_SYS_MMAN_H 1
+
- /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
++/* Define to 1 if you have the <sys/ndir.h> header file, and it defines 'DIR'.
+ */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
- /* Define to 1 if you have the `unsetenv' function. */
++/* Define to 1 if you have the 'unsetenv' function. */
+#define HAVE_UNSETENV 1
+
- /* Define to 1 if the system has the type `unsigned long long int'. */
++/* Define to 1 if the system has the type 'unsigned long long int'. */
+#define HAVE_UNSIGNED_LONG_LONG_INT 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
- /* Define to 1 if you have the `vfork' function. */
++/* Define to 1 if you have the 'vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
- /* Define to 1 if you have the `vprintf' function. */
++/* Define to 1 if you have the 'vprintf' function. */
+#define HAVE_VPRINTF 1
+
- /* Define to 1 if you have the `vsnprintf' function. */
++/* Define to 1 if you have the 'vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
- /* Define to 1 if you have the `wait3' function. */
++/* Define to 1 if you have the 'wait3' function. */
+#define HAVE_WAIT3 1
+
- /* Define to 1 if you have the `wait4' function. */
++/* Define to 1 if you have the 'wait4' function. */
+#define HAVE_WAIT4 1
+
- /* Define to 1 if you have the `waitpid' function. */
++/* Define to 1 if you have the 'waitpid' function. */
+#define HAVE_WAITPID 1
+
- /* Define to 1 if you have the `warn' function. */
++/* Define to 1 if you have the 'warn' function. */
+#define HAVE_WARN 1
+
- /* Define to 1 if you have the `warnx' function. */
++/* Define to 1 if you have the 'warnx' function. */
+#define HAVE_WARNX 1
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
- /* Define to 1 if `fork' works. */
++/* Define to 1 if 'fork' works. */
+#define HAVE_WORKING_FORK 1
+
- /* Define to 1 if `vfork' works. */
++/* Define to 1 if 'vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
+/* define if your compiler has __attribute__ */
+#define HAVE___ATTRIBUTE__ 1
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "sjg@NetBSD.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "bmake"
+
+/* Define to the full name and version of this package. */
- #define PACKAGE_STRING "bmake 20240314"
++#define PACKAGE_STRING "bmake 20240711"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "bmake"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
- #define PACKAGE_VERSION "20240314"
++#define PACKAGE_VERSION "20240711"
+
- /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
++/* Define to 1 if the 'S_IS*' macros in <sys/stat.h> do not work properly. */
+/* #undef STAT_MACROS_BROKEN */
+
- /* Define to 1 if all of the C90 standard headers exist (not just the ones
++/* Define to 1 if all of the C89 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
- /* Define to 1 if your <sys/time.h> declares `struct tm'. */
++/* Define to 1 if your <sys/time.h> declares 'struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
- /* Enable extensions on AIX 3, Interix. */
++/* Enable extensions on AIX, Interix, z/OS. */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable general extensions on macOS. */
+#ifndef _DARWIN_C_SOURCE
+# define _DARWIN_C_SOURCE 1
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# define __EXTENSIONS__ 1
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+ with -lxnet on HP-UX 11.11. */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# define _HPUX_ALT_XOPEN_SOCKET_API 1
+#endif
+/* Identify the host operating system as Minix.
+ This macro does not affect the system headers' behavior.
+ A future release of Autoconf may stop defining this macro. */
+#ifndef _MINIX
+/* # undef _MINIX */
+#endif
+/* Enable general extensions on NetBSD.
+ Enable NetBSD compatibility extensions on Minix. */
+#ifndef _NETBSD_SOURCE
+# define _NETBSD_SOURCE 1
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+ Oddly enough, this does nothing on OpenBSD. */
+#ifndef _OPENBSD_SOURCE
+# define _OPENBSD_SOURCE 1
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_SOURCE
+/* # undef _POSIX_SOURCE */
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_1_SOURCE
+/* # undef _POSIX_1_SOURCE */
+#endif
+/* Enable POSIX-compatible threading on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# define __STDC_WANT_IEC_60559_BFP_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# define __STDC_WANT_IEC_60559_DFP_EXT__ 1
+#endif
++/* Enable extensions specified by C23 Annex F. */
++#ifndef __STDC_WANT_IEC_60559_EXT__
++# define __STDC_WANT_IEC_60559_EXT__ 1
++#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1
+#endif
- /* Enable extensions specified by ISO/IEC TS 18661-3:2015. */
++/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
+#ifndef __STDC_WANT_LIB_EXT2__
+# define __STDC_WANT_LIB_EXT2__ 1
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009. */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# define __STDC_WANT_MATH_SPEC_FUNCS__ 1
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable X/Open extensions. Define to 500 only if necessary
+ to make mbstate_t available. */
+#ifndef _XOPEN_SOURCE
+/* # undef _XOPEN_SOURCE */
+#endif
+
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+ significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+# define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* # undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
+ #define below would cause a syntax error. */
+/* #undef _UINT32_T */
+
+/* C99 function name */
+/* #undef __func__ */
+
- /* Define to empty if `const' does not conform to ANSI C. */
++/* Define to empty if 'const' does not conform to ANSI C. */
+/* #undef const */
+
- /* Define to `__inline__' or `__inline' if that's what the C compiler
++/* Define to '__inline__' or '__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to the type of a signed integer type of width exactly 64 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef int64_t */
+
- /* Define to `int' if <sys/types.h> does not define. */
++/* Define to 'int' if <sys/types.h> does not define. */
+/* #undef mode_t */
+
- /* Define to `long int' if <sys/types.h> does not define. */
++/* Define to 'long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define as a signed integer type capable of holding a process identifier. */
+/* #undef pid_t */
+
+/* type that signal handlers can safely frob */
+/* #undef sig_atomic_t */
+
- /* Define to `unsigned int' if <sys/types.h> does not define. */
++/* Define as 'unsigned int' if <stddef.h> doesn't define. */
+/* #undef size_t */
+
+/* Define to the type of an unsigned integer type of width exactly 32 bits if
+ such a type exists and the standard includes do not define it. */
+/* #undef uint32_t */
+
- /* Define as `fork' if `vfork' does not work. */
++/* Define as 'fork' if 'vfork' does not work. */
+/* #undef vfork */
diff --cc usr.bin/bmake/unit-tests/Makefile
index 20e1b1cf94ee,000000000000..d70c0f87e459
mode 100644,000000..100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@@ -1,893 -1,0 +1,911 @@@
+# This is a generated file, do NOT edit!
+# See contrib/bmake/bsd.after-import.mk
+#
- # $Id: Makefile,v 1.219 2024/06/01 16:14:47 sjg Exp $
++# $Id: Makefile,v 1.224 2024/07/13 05:27:35 sjg Exp $
+#
- # $NetBSD: Makefile,v 1.347 2024/06/01 15:54:40 sjg Exp $
++# $NetBSD: Makefile,v 1.350 2024/07/07 09:37:00 rillig Exp $
+#
+# Unit tests for make(1)
+#
+# The main targets are:
+#
+# all:
+# run all the tests
+# test:
+# run 'all', and compare to expected results
+# accept:
+# move generated output to expected results
+#
+# Settable variables
+#
+# TEST_MAKE
+# The make program to be tested.
+#
+#
+# Adding a test case
+#
+# Each feature should get its own set of tests in its own suitably
+# named makefile (*.mk), with its own set of expected results (*.exp),
+# and it should be added to the TESTS list.
+#
+
+.MAIN: all
+
+# we use these below but we might be an older make
+.MAKE.OS?= ${uname -s:L:sh}
+.MAKE.UID?= ${id -u:L:sh}
+
+# for many tests we need a TMPDIR that will not collide
+# with other users.
+.if ${.OBJDIR} != ${.CURDIR}
+# easy
+TMPDIR:= ${.OBJDIR}/tmp
+.elif defined(TMPDIR)
+TMPDIR:= ${TMPDIR}/uid${.MAKE.UID}
+.else
+TMPDIR:= /tmp/uid${.MAKE.UID}
+.endif
+# make sure it exists
+.if !exist(${TMPDIR})
+_!= mkdir -p ${TMPDIR}
+.endif
+
+# Each test is in a sub-makefile.
+# Keep the list sorted.
+# Any test that is commented out must be ignored in
+# src/tests/usr.bin/make/t_make.sh as well.
+#TESTS+= archive
+#TESTS+= archive-suffix
+TESTS+= cmd-errors
+TESTS+= cmd-errors-jobs
+TESTS+= cmd-errors-lint
+TESTS+= cmd-interrupt
+TESTS+= cmdline
+TESTS+= cmdline-redirect-stdin
+TESTS+= cmdline-undefined
+TESTS+= comment
+TESTS+= compat-error
+TESTS+= cond-cmp-numeric
+TESTS+= cond-cmp-numeric-eq
+TESTS+= cond-cmp-numeric-ge
+TESTS+= cond-cmp-numeric-gt
+TESTS+= cond-cmp-numeric-le
+TESTS+= cond-cmp-numeric-lt
+TESTS+= cond-cmp-numeric-ne
+TESTS+= cond-cmp-string
+TESTS+= cond-cmp-unary
+TESTS+= cond-eof
+TESTS+= cond-func
+TESTS+= cond-func-commands
+TESTS+= cond-func-defined
+TESTS+= cond-func-empty
+TESTS+= cond-func-exists
+TESTS+= cond-func-make
+TESTS+= cond-func-make-main
+TESTS+= cond-func-target
+TESTS+= cond-late
+TESTS+= cond-op
+TESTS+= cond-op-and
+TESTS+= cond-op-and-lint
+TESTS+= cond-op-not
+TESTS+= cond-op-or
+TESTS+= cond-op-or-lint
+TESTS+= cond-op-parentheses
+TESTS+= cond-short
+TESTS+= cond-token-number
+TESTS+= cond-token-plain
+TESTS+= cond-token-string
+TESTS+= cond-token-var
+TESTS+= cond-undef-lint
+TESTS+= counter
+TESTS+= counter-append
+TESTS+= dep
+TESTS+= dep-colon
+TESTS+= dep-colon-bug-cross-file
+TESTS+= dep-double-colon
+TESTS+= dep-double-colon-indep
+TESTS+= dep-duplicate
+TESTS+= dep-exclam
+TESTS+= dep-none
+TESTS+= dep-op-missing
+TESTS+= dep-percent
+TESTS+= dep-var
+TESTS+= dep-wildcards
+TESTS+= depsrc
+TESTS+= depsrc-end
+TESTS+= depsrc-exec
+TESTS+= depsrc-ignore
+TESTS+= depsrc-made
+TESTS+= depsrc-make
+TESTS+= depsrc-meta
+TESTS+= depsrc-nometa
+TESTS+= depsrc-nometa_cmp
+TESTS+= depsrc-nopath
+TESTS+= depsrc-notmain
+TESTS+= depsrc-optional
+TESTS+= depsrc-phony
+TESTS+= depsrc-precious
+TESTS+= depsrc-recursive
+TESTS+= depsrc-silent
+TESTS+= depsrc-use
+TESTS+= depsrc-usebefore
+TESTS+= depsrc-usebefore-double-colon
+TESTS+= depsrc-wait
+TESTS+= deptgt
+TESTS+= deptgt-begin
+TESTS+= deptgt-begin-fail
+TESTS+= deptgt-begin-fail-indirect
+TESTS+= deptgt-default
+TESTS+= deptgt-delete_on_error
+TESTS+= deptgt-end
+TESTS+= deptgt-end-fail
+TESTS+= deptgt-end-fail-all
+TESTS+= deptgt-end-fail-indirect
+TESTS+= deptgt-end-jobs
+TESTS+= deptgt-error
+TESTS+= deptgt-ignore
+TESTS+= deptgt-interrupt
+TESTS+= deptgt-main
+TESTS+= deptgt-makeflags
+TESTS+= deptgt-no_parallel
+TESTS+= deptgt-nopath
+TESTS+= deptgt-notparallel
+TESTS+= deptgt-objdir
+TESTS+= deptgt-order
+TESTS+= deptgt-path
+TESTS+= deptgt-path-suffix
+TESTS+= deptgt-phony
+TESTS+= deptgt-posix
+TESTS+= deptgt-precious
+TESTS+= deptgt-shell
+TESTS+= deptgt-silent
+TESTS+= deptgt-silent-jobs
+TESTS+= deptgt-stale
+TESTS+= deptgt-suffixes
+TESTS+= dir
+TESTS+= dir-expand-path
+TESTS+= directive
+TESTS+= directive-dinclude
+TESTS+= directive-elif
+TESTS+= directive-elifdef
+TESTS+= directive-elifmake
+TESTS+= directive-elifndef
+TESTS+= directive-elifnmake
+TESTS+= directive-else
+TESTS+= directive-endfor
+TESTS+= directive-endif
+TESTS+= directive-error
+TESTS+= directive-export
+TESTS+= directive-export-env
+TESTS+= directive-export-impl
+TESTS+= directive-export-gmake
+TESTS+= directive-export-literal
+TESTS+= directive-for
+TESTS+= directive-for-break
+TESTS+= directive-for-empty
+TESTS+= directive-for-errors
+TESTS+= directive-for-escape
+TESTS+= directive-for-generating-endif
+TESTS+= directive-for-if
+TESTS+= directive-for-lines
*** 726 LINES SKIPPED ***