Date: Tue, 11 Feb 2025 17:45:43 GMT From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e9c2838d93ca - main - Add newlog.sh and setops.sh to share/mk Message-ID: <202502111745.51BHjhbV052933@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e9c2838d93cab8098e333a32990d75439dc84359 commit e9c2838d93cab8098e333a32990d75439dc84359 Author: Simon J. Gerraty <sjg@FreeBSD.org> AuthorDate: 2025-02-11 17:42:17 +0000 Commit: Simon J. Gerraty <sjg@FreeBSD.org> CommitDate: 2025-02-11 17:42:17 +0000 Add newlog.sh and setops.sh to share/mk jobs.mk makes use of newlog.sh if found. Set NEWLOG_SH in local.sys.env.mk to save jobs.mk searching for it. PR: 284390 Reviewed by: stevek Differential Revision: https://reviews.freebsd.org/D48737 --- share/mk/Makefile | 7 +++++++ share/mk/local.sys.env.mk | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/share/mk/Makefile b/share/mk/Makefile index 737b11d5a0f2..ec9af16d24c3 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -69,8 +69,10 @@ FILES= \ meta.sys.mk \ meta2deps.py \ meta2deps.sh \ + ${SRCTOP}/contrib/bmake/mk/newlog.sh \ ${SRCTOP}/contrib/bmake/mk/posix.mk \ stage-install.sh \ + ${SRCTOP}/contrib/bmake/mk/setopts.sh \ sys.mk \ sys.dependfile.mk \ sys.dirdeps.mk \ @@ -78,6 +80,11 @@ FILES= \ FILESDIR= ${BINDIR}/mk +# make sure scripts are executable +.for file in ${FILES:M*.sh} ${FILES:M*.py} +FILESMODE_${file} = 555 +.endfor + .if ${MK_TESTS} != "no" FILES+= atf.test.mk FILES+= googletest.test.inc.mk diff --git a/share/mk/local.sys.env.mk b/share/mk/local.sys.env.mk index 71a46f122bf4..470c2d8559eb 100644 --- a/share/mk/local.sys.env.mk +++ b/share/mk/local.sys.env.mk @@ -43,6 +43,12 @@ TIME_STAMP_END?= ${TIME_STAMP_DATE} # error spam and show a proper error. Mkdirs= Mkdirs() { mkdir -p $$* || :; } +# jobs.mk wants this +.if empty(NEWLOG_SH) +NEWLOG_SH:= ${SRCTOP}/contrib/bmake/mk/newlog.sh +.export NEWLOG_SH +.endif + .if !empty(.MAKEFLAGS:M-s) ECHO_TRACE?= true .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502111745.51BHjhbV052933>