Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9E31684EC5 for ; Thu, 12 Oct 2023 13:31:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id UQ0J-zWgI6sa for ; Thu, 12 Oct 2023 13:31:11 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E5C3784E7A for ; Thu, 12 Oct 2023 13:31:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DEB80FADC; Thu, 12 Oct 2023 13:31:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1697117470210" MIME-Version: 1.0 Date: Thu, 12 Oct 2023 13:31:10 +0000 From: "Taylor R Campbell" Subject: CVS commit: pkgsrc/mk/pkgformat/pkg To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: riastradh@netbsd.org X-Mailer: log_accum Message-Id: <20231012133110.DEB80FADC@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1697117470210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: riastradh Date: Thu Oct 12 13:31:10 UTC 2023 Modified Files: pkgsrc/mk/pkgformat/pkg: metadata.mk Log Message: mk/pkgformat/mk/metadata.mk: Include TOOL_DEPENDS in @blddep. This is necessary to trigger certain critical rebuilds: https://mail-index.netbsd.org/tech-pkg/2023/10/12/msg028291.html We should consider creating a separate @tooldep or something, but it's not clear whether that's needed and fixing native builds now is higher priority than sorting out semantics for cross builds. XXX pullup-2023Q3 even though this changes mk/ To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 pkgsrc/mk/pkgformat/pkg/metadata.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1697117470210 Content-Disposition: inline Content-Length: 1026 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/pkgformat/pkg/metadata.mk diff -u pkgsrc/mk/pkgformat/pkg/metadata.mk:1.34 pkgsrc/mk/pkgformat/pkg/metadata.mk:1.35 --- pkgsrc/mk/pkgformat/pkg/metadata.mk:1.34 Wed Nov 23 11:17:51 2022 +++ pkgsrc/mk/pkgformat/pkg/metadata.mk Thu Oct 12 13:31:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.34 2022/11/23 11:17:51 jperkin Exp $ +# $NetBSD: metadata.mk,v 1.35 2023/10/12 13:31:10 riastradh Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -407,7 +407,7 @@ ${_DEPENDS_PLIST}: ${PLIST} ${RUN} { \ ${ECHO} "@name ${PKGNAME}"; \ ${AWK} '$$1 == "full" { printf "@blddep %s\n@pkgdep %s\n", $$3, $$2; }' < ${_RDEPENDS_FILE}; \ - ${AWK} '$$1 == "bootstrap" || $$1 == "build" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \ + ${AWK} '$$1 == "bootstrap" || $$1 == "build" || $$1 == "tool" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \ ${CAT} ${PLIST}; } > ${.TARGET} _PKG_CREATE_ARGS+= -l -U --_----------=_1697117470210--