git: 9d3df31ec06f - main - Merge bmake-20240520
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 May 2024 20:14:19 UTC
The branch main has been updated by sjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=9d3df31ec06fe91c5c67da464f11408474d57174
commit 9d3df31ec06fe91c5c67da464f11408474d57174
Merge: 2356b60be702 29efb3dcaedd
Author: Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2024-05-23 20:11:02 +0000
Commit: Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2024-05-23 20:12:43 +0000
Merge bmake-20240520
Merge commit '29efb3dcaedd9cbabc6f96f35545baf2c8b28501'
contrib/bmake/ChangeLog | 15 +++++++++
contrib/bmake/VERSION | 2 +-
contrib/bmake/dir.c | 51 ++++++++++++++++++++++++++-----
contrib/bmake/dir.h | 3 +-
contrib/bmake/getopt.c | 6 ++--
contrib/bmake/main.c | 6 ++--
contrib/bmake/parse.c | 6 ++--
contrib/bmake/unit-tests/deptgt-phony.exp | 2 +-
usr.bin/bmake/Makefile.config | 2 +-
9 files changed, 71 insertions(+), 22 deletions(-)
diff --cc usr.bin/bmake/Makefile.config
index 55bc4a4370ca,000000000000..e62d207b70ac
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?=20240508
++_MAKE_VERSION?=20240520
+
+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}