git: 988758838533 - main - Merge bmake-20230909
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 18 Sep 2023 01:10:12 UTC
The branch main has been updated by sjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=988758838533b24f5893b36514fe2c68a3f911a2
commit 988758838533b24f5893b36514fe2c68a3f911a2
Merge: a6662c37b6ff 1012cf15f75d
Author: Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2023-09-18 01:05:19 +0000
Commit: Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2023-09-18 01:09:37 +0000
Merge bmake-20230909
Merge commit '1012cf15f75d1e9048779abd07270a37cdba590a'
contrib/bmake/ChangeLog | 78 +++++++
contrib/bmake/VERSION | 2 +-
contrib/bmake/bmake.1 | 34 +++-
contrib/bmake/bmake.cat1 | 48 +++--
contrib/bmake/boot-strap | 4 +-
contrib/bmake/cond.c | 23 +--
contrib/bmake/configure | 61 ++++--
contrib/bmake/configure.in | 51 +++--
contrib/bmake/import.sh | 34 +++-
contrib/bmake/install-sh | 20 +-
contrib/bmake/main.c | 47 ++++-
contrib/bmake/make-bootstrap.sh.in | 1 +
contrib/bmake/make.1 | 34 +++-
contrib/bmake/make.h | 15 +-
contrib/bmake/meta.c | 9 +-
contrib/bmake/mk/ChangeLog | 43 ++++
contrib/bmake/mk/FILES | 1 +
contrib/bmake/mk/dirdeps.mk | 22 +-
contrib/bmake/mk/install-mk | 6 +-
contrib/bmake/mk/install-sh | 226 +++++++++++++++++++++
contrib/bmake/mk/jobs.mk | 24 ++-
contrib/bmake/mk/lib.mk | 6 +-
contrib/bmake/mk/meta.autodep.mk | 4 +-
contrib/bmake/mk/mk-files.txt | 16 +-
contrib/bmake/mk/rst2htm.mk | 8 +-
contrib/bmake/mk/sys.mk | 20 +-
contrib/bmake/mk/sys/IRIX.mk | 13 +-
contrib/bmake/parse.c | 35 ++--
contrib/bmake/unit-tests/Makefile | 22 +-
contrib/bmake/unit-tests/cond-cmp-numeric-eq.mk | 7 +-
contrib/bmake/unit-tests/cond-cmp-numeric-ge.mk | 4 +-
contrib/bmake/unit-tests/cond-cmp-numeric-gt.mk | 6 +-
contrib/bmake/unit-tests/cond-cmp-numeric-le.mk | 4 +-
contrib/bmake/unit-tests/cond-cmp-numeric-lt.mk | 4 +-
contrib/bmake/unit-tests/cond-cmp-numeric-ne.mk | 4 +-
contrib/bmake/unit-tests/cond-func-empty.exp | 4 +-
contrib/bmake/unit-tests/cond-func-empty.mk | 36 +++-
contrib/bmake/unit-tests/cond-op-and.mk | 10 +-
contrib/bmake/unit-tests/cond-op-or.mk | 10 +-
contrib/bmake/unit-tests/dep-op-missing.exp | 2 +-
contrib/bmake/unit-tests/directive-dinclude.exp | 2 +-
contrib/bmake/unit-tests/directive-dinclude.mk | 4 +-
.../bmake/unit-tests/directive-export-gmake.exp | 6 +-
contrib/bmake/unit-tests/directive-export-gmake.mk | 27 ++-
contrib/bmake/unit-tests/directive-export.exp | 3 +
contrib/bmake/unit-tests/directive-export.mk | 19 +-
contrib/bmake/unit-tests/directive-for-escape.exp | 83 +++++---
contrib/bmake/unit-tests/directive-for-escape.mk | 46 ++++-
.../bmake/unit-tests/directive-hyphen-include.exp | 2 +-
.../bmake/unit-tests/directive-hyphen-include.mk | 4 +-
.../bmake/unit-tests/directive-include-guard.exp | 16 +-
.../bmake/unit-tests/directive-include-guard.mk | 74 +++----
contrib/bmake/unit-tests/directive-include.exp | 2 +-
contrib/bmake/unit-tests/directive-include.mk | 4 +-
contrib/bmake/unit-tests/directive-sinclude.exp | 2 +-
contrib/bmake/unit-tests/directive-sinclude.mk | 4 +-
contrib/bmake/unit-tests/directive.exp | 8 +-
contrib/bmake/unit-tests/directive.mk | 10 +-
contrib/bmake/unit-tests/opt-debug-graph1.exp | 1 +
contrib/bmake/unit-tests/opt-debug-graph2.exp | 1 +
contrib/bmake/unit-tests/opt-debug-graph3.exp | 1 +
contrib/bmake/unit-tests/opt-jobs.mk | 56 ++++-
contrib/bmake/unit-tests/parse.exp | 6 +-
contrib/bmake/unit-tests/parse.mk | 8 +-
contrib/bmake/unit-tests/suff-main-several.exp | 1 +
contrib/bmake/unit-tests/suff-transform-debug.exp | 1 +
contrib/bmake/unit-tests/var-op-assign.exp | 2 +-
contrib/bmake/unit-tests/var-op-assign.mk | 4 +-
contrib/bmake/unit-tests/varmod-gmtime.mk | 31 ++-
contrib/bmake/unit-tests/varmod-ifelse.exp | 26 ++-
contrib/bmake/unit-tests/varmod-ifelse.mk | 54 ++++-
contrib/bmake/unit-tests/varmod-mtime.exp | 9 +-
contrib/bmake/unit-tests/varmod-mtime.mk | 86 ++++++--
contrib/bmake/unit-tests/varname-dot-make-jobs.exp | 2 +-
contrib/bmake/unit-tests/varname-dot-make-jobs.mk | 27 ++-
contrib/bmake/unit-tests/varname.exp | 2 +-
contrib/bmake/unit-tests/varname.mk | 4 +-
contrib/bmake/var.c | 53 +++--
usr.bin/bmake/Makefile.config | 2 +-
usr.bin/bmake/config.h | 4 +-
usr.bin/bmake/unit-tests/Makefile | 22 +-
81 files changed, 1309 insertions(+), 408 deletions(-)
diff --cc contrib/bmake/mk/install-sh
index 000000000000,1fa52a59de7e..1fa52a59de7e
mode 000000,100755..100755
--- a/contrib/bmake/mk/install-sh
+++ b/contrib/bmake/mk/install-sh
diff --cc usr.bin/bmake/Makefile.config
index 0f67b27f271a,000000000000..c31d0790ed9e
mode 100644,000000..100644
--- a/usr.bin/bmake/Makefile.config
+++ b/usr.bin/bmake/Makefile.config
@@@ -1,27 -1,0 +1,27 @@@
+# 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?=20230622
++_MAKE_VERSION?=20230909
+
+prefix?= /usr
+srcdir= ${SRCTOP}/contrib/bmake
+CC?= cc
+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 fa7451e3ba0d,000000000000..af8b4c8e02ba
mode 100644,000000..100644
--- a/usr.bin/bmake/config.h
+++ b/usr.bin/bmake/config.h
@@@ -1,445 -1,0 +1,445 @@@
+/* 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
+ don't. */
+#define HAVE_DECL_SYS_SIGLIST 1
+
+/* 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 HAVE_DIRNAME 1
+
+/* 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 HAVE_ERR 1
+
+/* 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 HAVE_FORK 1
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define to 1 if you have the `getenv' function. */
+#define HAVE_GETENV 1
+
+/* Define to 1 if you have the `getopt' function. */
+#define HAVE_GETOPT 1
+
+/* 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 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 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'. */
+/* #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 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 HAVE_REALPATH 1
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `setenv' function. */
+#define HAVE_SETENV 1
+
+/* Define to 1 if you have the `setpgid' function. */
+#define HAVE_SETPGID 1
+
+/* Define to 1 if you have the `setrlimit' function. */
+#define HAVE_SETRLIMIT 1
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `sigaction' function. */
+#define HAVE_SIGACTION 1
+
+/* Define to 1 if you have the `sigaddset' function. */
+#define HAVE_SIGADDSET 1
+
+/* Define to 1 if you have the `sigpending' function. */
+#define HAVE_SIGPENDING 1
+
+/* Define to 1 if you have the `sigprocmask' function. */
+#define HAVE_SIGPROCMASK 1
+
+/* Define to 1 if you have the `sigsetmask' function. */
+#define HAVE_SIGSETMASK 1
+
+/* Define to 1 if you have the `sigsuspend' function. */
+#define HAVE_SIGSUSPEND 1
+
+/* 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 HAVE_SIG_ATOMIC_T 1
+
+/* 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 HAVE_STRERROR 1
+
+/* Define to 1 if you have the `stresep' function. */
+/* #undef HAVE_STRESEP */
+
+/* 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 HAVE_STRLCPY 1
+
+/* Define to 1 if you have the `strsep' function. */
+#define HAVE_STRSEP 1
+
+/* Define to 1 if you have the `strtod' function. */
+#define HAVE_STRTOD 1
+
+/* Define to 1 if you have the `strtol' function. */
+#define HAVE_STRTOL 1
+
+/* Define to 1 if you have the `strtoll' function. */
+#define HAVE_STRTOLL 1
+
+/* Define to 1 if you have the `strtoul' function. */
+#define HAVE_STRTOUL 1
+
+/* 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'.
+ */
+/* #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'.
+ */
+/* #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 HAVE_UNSETENV 1
+
+/* 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 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 HAVE_VPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
+/* Define to 1 if you have the `wait3' function. */
+#define HAVE_WAIT3 1
+
+/* Define to 1 if you have the `wait4' function. */
+#define HAVE_WAIT4 1
+
+/* Define to 1 if you have the `waitpid' function. */
+#define HAVE_WAITPID 1
+
+/* Define to 1 if you have the `warn' function. */
+#define HAVE_WARN 1
+
+/* 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 HAVE_WORKING_FORK 1
+
+/* 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 20220909"
++#define PACKAGE_STRING "bmake 20230723"
+
+/* 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 "20220909"
++#define PACKAGE_VERSION "20230723"
+
+/* 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
+ 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'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Enable extensions on AIX 3, Interix. */
+#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 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. */
+#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. */
+/* #undef const */
+
+/* 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. */
+/* #undef mode_t */
+
+/* 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. */
+/* #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. */
+/* #undef vfork */
diff --cc usr.bin/bmake/unit-tests/Makefile
index 055b65e1b48d,000000000000..c5cc7646efed
mode 100644,000000..100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@@ -1,867 -1,0 +1,885 @@@
+# This is a generated file, do NOT edit!
+# See contrib/bmake/bsd.after-import.mk
+#
- # $Id: Makefile,v 1.199 2023/06/20 17:27:20 sjg Exp $
++# $Id: Makefile,v 1.207 2023/09/09 16:44:03 sjg Exp $
+#
- # $NetBSD: Makefile,v 1.339 2023/06/20 09:25:34 rillig Exp $
++# $NetBSD: Makefile,v 1.341 2023/09/09 16:41:04 sjg 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
+TESTS+= directive-for-null
+TESTS+= directive-hyphen-include
+TESTS+= directive-if
+TESTS+= directive-if-nested
+TESTS+= directive-ifdef
+TESTS+= directive-ifmake
+TESTS+= directive-ifndef
+TESTS+= directive-ifnmake
+TESTS+= directive-include
+TESTS+= directive-include-fatal
+TESTS+= directive-include-guard
+TESTS+= directive-info
+TESTS+= directive-misspellings
+TESTS+= directive-sinclude
+TESTS+= directive-undef
+TESTS+= directive-unexport
+TESTS+= directive-unexport-env
+TESTS+= directive-warning
+TESTS+= dollar
+TESTS+= doterror
+TESTS+= dotwait
+TESTS+= error
+TESTS+= # escape # broken by reverting POSIX changes
+TESTS+= export
+TESTS+= export-all
+TESTS+= export-env
+TESTS+= export-variants
+TESTS+= gnode-submake
+TESTS+= hanoi-include
+TESTS+= impsrc
+TESTS+= include-main
+TESTS+= job-flags
+#TESTS+= job-output-long-lines
+TESTS+= job-output-null
+TESTS+= jobs-empty-commands
+TESTS+= jobs-empty-commands-error
+TESTS+= jobs-error-indirect
+TESTS+= jobs-error-nested
+TESTS+= jobs-error-nested-make
+TESTS+= lint
+TESTS+= make-exported
+TESTS+= meta-cmd-cmp
+TESTS+= moderrs
+TESTS+= modmisc
+.if ${.MAKE.UID} > 0
+TESTS+= objdir-writable
+.endif
+TESTS+= opt
+TESTS+= opt-backwards
+TESTS+= opt-chdir
+TESTS+= opt-debug
+TESTS+= opt-debug-all
+TESTS+= opt-debug-archive
+TESTS+= opt-debug-curdir
+TESTS+= opt-debug-cond
+TESTS+= opt-debug-dir
+TESTS+= opt-debug-errors
+TESTS+= opt-debug-errors-jobs
+TESTS+= opt-debug-file
+TESTS+= opt-debug-for
+TESTS+= opt-debug-graph1
+TESTS+= opt-debug-graph2
+TESTS+= opt-debug-graph3
+TESTS+= opt-debug-hash
+#TESTS+= opt-debug-jobs
+TESTS+= opt-debug-lint
+TESTS+= opt-debug-loud
+TESTS+= opt-debug-meta
+TESTS+= opt-debug-making
+TESTS+= opt-debug-no-rm
+TESTS+= opt-debug-parse
+TESTS+= opt-debug-suff
+TESTS+= opt-debug-targets
+TESTS+= opt-debug-varraw
+TESTS+= opt-debug-var
+TESTS+= opt-debug-x-trace
+TESTS+= opt-define
+TESTS+= opt-env
+TESTS+= opt-file
+TESTS+= opt-ignore
+TESTS+= opt-include-dir
+TESTS+= opt-jobs
+TESTS+= opt-jobs-internal
+TESTS+= opt-jobs-no-action
+TESTS+= opt-keep-going
+TESTS+= opt-keep-going-indirect
+TESTS+= opt-keep-going-multiple
+TESTS+= opt-m-include-dir
+TESTS+= opt-no-action
+TESTS+= opt-no-action-at-all
+TESTS+= opt-no-action-runflags
+TESTS+= opt-no-action-touch
+TESTS+= opt-query
+TESTS+= opt-raw
+TESTS+= opt-silent
+TESTS+= opt-touch
+TESTS+= opt-touch-jobs
+TESTS+= opt-tracefile
+TESTS+= opt-var-expanded
+TESTS+= opt-var-literal
+TESTS+= opt-version
+TESTS+= opt-warnings-as-errors
+TESTS+= opt-where-am-i
+TESTS+= opt-x-reduce-exported
+TESTS+= order
+TESTS+= parse
+TESTS+= parse-var
+TESTS+= phony-end
+TESTS+= posix
+TESTS+= # posix1 # broken by reverting POSIX changes
+TESTS+= recursive
+TESTS+= sh
+TESTS+= sh-dots
+TESTS+= sh-errctl
+TESTS+= sh-flags
+TESTS+= sh-jobs
+TESTS+= sh-jobs-error
+TESTS+= sh-leading-at
+TESTS+= sh-leading-hyphen
+TESTS+= sh-leading-plus
+TESTS+= sh-meta-chars
+TESTS+= sh-multi-line
+TESTS+= sh-single-line
+TESTS+= shell-csh
+TESTS+= shell-custom
+.if exists(/bin/ksh)
+TESTS+= shell-ksh
+.endif
+TESTS+= shell-sh
+TESTS+= suff-add-later
+TESTS+= suff-clear-regular
+TESTS+= suff-clear-single
+TESTS+= suff-incomplete
+TESTS+= suff-lookup
+TESTS+= suff-main
+TESTS+= suff-main-several
+TESTS+= suff-phony
+TESTS+= suff-rebuild
+TESTS+= suff-self
+TESTS+= suff-transform-debug
+TESTS+= suff-transform-endless
+TESTS+= suff-transform-expand
+TESTS+= suff-transform-select
+TESTS+= suff-use
+TESTS+= sunshcmd
+TESTS+= ternary
+TESTS+= unexport
+TESTS+= unexport-env
+TESTS+= use-inference
+TESTS+= var-readonly
+TESTS+= var-scope
+TESTS+= var-scope-cmdline
+TESTS+= var-scope-env
+TESTS+= var-scope-global
+TESTS+= var-scope-local
+TESTS+= var-scope-local-legacy
+TESTS+= var-eval-short
+TESTS+= var-op
+TESTS+= var-op-append
+TESTS+= var-op-assign
+TESTS+= var-op-default
+TESTS+= var-op-expand
+TESTS+= var-op-shell
+TESTS+= var-op-sunsh
+TESTS+= var-recursive
+TESTS+= varcmd
+TESTS+= vardebug
+TESTS+= varfind
+TESTS+= varmisc
+TESTS+= varmod
+TESTS+= varmod-assign
+TESTS+= varmod-assign-shell
+TESTS+= varmod-defined
+TESTS+= varmod-edge
+TESTS+= varmod-exclam-shell
+TESTS+= varmod-extension
+TESTS+= varmod-gmtime
+TESTS+= varmod-hash
+TESTS+= varmod-head
+TESTS+= varmod-ifelse
+TESTS+= varmod-indirect
+TESTS+= varmod-l-name-to-value
+TESTS+= varmod-localtime
+TESTS+= varmod-loop
+TESTS+= varmod-loop-delete
+TESTS+= varmod-loop-varname
+TESTS+= varmod-match
+TESTS+= varmod-match-escape
+TESTS+= varmod-mtime
+TESTS+= varmod-no-match
+TESTS+= varmod-order
+TESTS+= varmod-order-numeric
+TESTS+= varmod-order-reverse
+TESTS+= varmod-order-shuffle
+TESTS+= varmod-order-string
+TESTS+= varmod-path
+TESTS+= varmod-quote
+TESTS+= varmod-quote-dollar
+TESTS+= varmod-range
*** 496 LINES SKIPPED ***