From nobody Tue Feb 11 17:45:43 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yspkw1Rprz5mQVm; Tue, 11 Feb 2025 17:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yspkw08fSz3Vj9; Tue, 11 Feb 2025 17:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739295944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2t+bG9vDTFLcpjCGv/WEGCDdUbp1UMLjOsD/aQMd5NM=; b=m0ZYgHlZNqM2gAYiVCqf9tT9b5GJTNxgMG/j2n5kM5h+dbEke1W3++iLr2Ytt1prl50Dpb D3w73Q4pmad92bTIrNmC5bjpolwLe1Xx/4np6psZuKH+HUGlS5mN4rvVUCrg62ajOP/r4E 05j/J04VDNN2YuTzsX7TiyCAH0sdokuRMqCG11rVeUERDaLzvxF2JFbY4wjCWG8575ndfs uBLdZMkGw57BENzRBGsCwfSv8GuqtGRPmLT3iti2XXHR/7X9+9p8+yACRq8QY1JoMcjXU0 o+qTM7fV2JG6HIFDzabmmwawrgswSvC6x9PPSzg7fzSNjHfz3lpTIbbgf1AeJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739295944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2t+bG9vDTFLcpjCGv/WEGCDdUbp1UMLjOsD/aQMd5NM=; b=cICiA7BW8hHy46ds94pUQF32B/WH75yQKiAjToxTBIaUJ2mEF76pnQ2Imjf/NMo2tdZrlu orGuyuwFIqkooO52h7cqIrltUdlZQgcCnaoo5H/IQhtQDZukNICFztx2hWhoNHq9V0jTF5 0mBNOYcPDD/cFnat1avdDRdH1S25HTO5XWIulmLf7K0cpFc4v6JlMvkg0WECTZEa/Apgfo rc6mFi0GDPgowWMkrBhjUNngKAr1HPoNi5csVIV2CX0owkbo2YYYpey9rhXZFqCjyNCTgy ywkC1u0SyNVVtTLd3Mho0k6NJIpgNVR0sip25Szu668biRt/sjiYT/Tcwmpsmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739295944; a=rsa-sha256; cv=none; b=JVK8QiXuZBvyE+Q267yTavjWbPOfFeJlHVtHqtfX9qOA7skyWv61Zy8qe7Q9v0Fs5gNLmx +Qtitz+XqGEcZnYj8ZqT8TZ4K/+0ij1NyBtc6uCACtAjxFKFY1fGKmGF2MLLAWEN6uuezK aa9O/HsmPkqEHtLeKng2MkQZXeGPc5JuQUARmJWRL5qaICsv9fgO0+TQq50qVigdji0+b9 7otjYtFBKrzd5/7haPROm8+EdBNwGZWJcKvBBfEZctDef2a+q9JVckCyLWJk3X1TmT2+i7 7zC9OiR3UWV8qYjOMVukH2Ir94sgSazs/p6Wx3ON0L5f0Fc+TX4yXd7GjiKCXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yspkv6Svqz62N; Tue, 11 Feb 2025 17:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BHjheG052936; Tue, 11 Feb 2025 17:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BHjhbV052933; Tue, 11 Feb 2025 17:45:43 GMT (envelope-from git) Date: Tue, 11 Feb 2025 17:45:43 GMT Message-Id: <202502111745.51BHjhbV052933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: e9c2838d93ca - main - Add newlog.sh and setops.sh to share/mk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9c2838d93cab8098e333a32990d75439dc84359 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e9c2838d93cab8098e333a32990d75439dc84359 commit e9c2838d93cab8098e333a32990d75439dc84359 Author: Simon J. Gerraty AuthorDate: 2025-02-11 17:42:17 +0000 Commit: Simon J. Gerraty 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