git: c9f4001f81c4 - main - Merge bmake-20240508
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 May 2024 05:22:41 UTC
The branch main has been updated by sjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=c9f4001f81c4d5778f70f77dc9892d1c4ecfdcdb
commit c9f4001f81c4d5778f70f77dc9892d1c4ecfdcdb
Merge: b5a1f0406b9d 3c2ab5fddc57
Author: Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2024-05-14 05:17:23 +0000
Commit: Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2024-05-14 05:19:20 +0000
Merge bmake-20240508
Merge commit '3c2ab5fddc576e58f3ffa70dc5fa95144646a513'
contrib/bmake/ChangeLog | 8 ++++++++
contrib/bmake/VERSION | 2 +-
contrib/bmake/job.c | 7 ++++---
contrib/bmake/main.c | 6 +++---
contrib/bmake/make.h | 5 +++--
contrib/bmake/mk/ChangeLog | 7 +++++++
contrib/bmake/mk/dirdeps.mk | 7 +++++--
contrib/bmake/mk/install-mk | 4 ++--
contrib/bmake/unit-tests/opt-debug-graph1.exp | 2 +-
contrib/bmake/unit-tests/opt-debug-graph2.exp | 2 +-
contrib/bmake/unit-tests/opt-debug-graph3.exp | 2 +-
contrib/bmake/unit-tests/suff-main-several.exp | 2 +-
contrib/bmake/unit-tests/suff-transform-debug.exp | 2 +-
contrib/bmake/unit-tests/varname-dot-makeoverrides.exp | 6 +++---
contrib/bmake/unit-tests/varname-dot-makeoverrides.mk | 4 ++--
contrib/bmake/var.c | 17 +++++++----------
usr.bin/bmake/Makefile.config | 2 +-
17 files changed, 51 insertions(+), 34 deletions(-)
diff --cc contrib/bmake/mk/install-mk
index 97874ac49016,c2962ffee6dc..c2962ffee6dc
mode 100755,100644..100644
--- a/contrib/bmake/mk/install-mk
+++ b/contrib/bmake/mk/install-mk
diff --cc usr.bin/bmake/Makefile.config
index ee717d952846,000000000000..55bc4a4370ca
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?=20240430
++_MAKE_VERSION?=20240508
+
+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}