Thu Oct 12 13:31:10 2023 UTC ()
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/


(riastradh)
diff -r1.34 -r1.35 pkgsrc/mk/pkgformat/pkg/metadata.mk
cvs diff -r1.34 -r1.35 pkgsrc/mk/pkgformat/pkg/metadata.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/metadata.mk 2022/11/23 11:17:51 1.34
+++ pkgsrc/mk/pkgformat/pkg/metadata.mk 2023/10/12 13:31:10 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: metadata.mk,v 1.34 2022/11/23 11:17:51 jperkin Exp $ 1# $NetBSD: metadata.mk,v 1.35 2023/10/12 13:31:10 riastradh Exp $
2 2
3###################################################################### 3######################################################################
4### The targets below are all PRIVATE. 4### The targets below are all PRIVATE.
5###################################################################### 5######################################################################
6 6
7###################################################################### 7######################################################################
8### 8###
9### Temporary package meta-data directory. The contents of this directory 9### Temporary package meta-data directory. The contents of this directory
10### are copied directly into the real package meta-data directory. 10### are copied directly into the real package meta-data directory.
11### 11###
12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb 12PKG_DB_TMPDIR= ${WRKDIR}/.pkgdb
13 13
14unprivileged-install-hook: ${PKG_DB_TMPDIR} 14unprivileged-install-hook: ${PKG_DB_TMPDIR}
@@ -397,27 +397,27 @@ ${_SIZE_ALL_FILE}: ${_RDEPENDS_FILE} ${_ @@ -397,27 +397,27 @@ ${_SIZE_ALL_FILE}: ${_RDEPENDS_FILE} ${_
397### 397###
398### This file contains the list of files and checksums, along with 398### This file contains the list of files and checksums, along with
399### any special "@" commands, e.g. @dirrm. 399### any special "@" commands, e.g. @dirrm.
400### 400###
401_CONTENTS_FILE= ${PKG_DB_TMPDIR}/+CONTENTS 401_CONTENTS_FILE= ${PKG_DB_TMPDIR}/+CONTENTS
402_METADATA_TARGETS+= ${_CONTENTS_FILE} 402_METADATA_TARGETS+= ${_CONTENTS_FILE}
403 403
404_DEPENDS_PLIST= ${WRKDIR}/.PLIST_deps 404_DEPENDS_PLIST= ${WRKDIR}/.PLIST_deps
405 405
406${_DEPENDS_PLIST}: ${PLIST} 406${_DEPENDS_PLIST}: ${PLIST}
407 ${RUN} { \ 407 ${RUN} { \
408 ${ECHO} "@name ${PKGNAME}"; \ 408 ${ECHO} "@name ${PKGNAME}"; \
409 ${AWK} '$$1 == "full" { printf "@blddep %s\n@pkgdep %s\n", $$3, $$2; }' < ${_RDEPENDS_FILE}; \ 409 ${AWK} '$$1 == "full" { printf "@blddep %s\n@pkgdep %s\n", $$3, $$2; }' < ${_RDEPENDS_FILE}; \
410 ${AWK} '$$1 == "bootstrap" || $$1 == "build" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \ 410 ${AWK} '$$1 == "bootstrap" || $$1 == "build" || $$1 == "tool" { printf "@blddep %s\n", $$3; }' < ${_RDEPENDS_FILE}; \
411 ${CAT} ${PLIST}; } > ${.TARGET} 411 ${CAT} ${PLIST}; } > ${.TARGET}
412 412
413_PKG_CREATE_ARGS+= -l -U 413_PKG_CREATE_ARGS+= -l -U
414_PKG_CREATE_ARGS+= -B ${_BUILD_INFO_FILE} 414_PKG_CREATE_ARGS+= -B ${_BUILD_INFO_FILE}
415_PKG_CREATE_ARGS+= -b ${_BUILD_VERSION_FILE} 415_PKG_CREATE_ARGS+= -b ${_BUILD_VERSION_FILE}
416_PKG_CREATE_ARGS+= -c ${_COMMENT_FILE} 416_PKG_CREATE_ARGS+= -c ${_COMMENT_FILE}
417_PKG_CREATE_ARGS+= ${_MESSAGE_FILE:D -D ${_MESSAGE_FILE}} 417_PKG_CREATE_ARGS+= ${_MESSAGE_FILE:D -D ${_MESSAGE_FILE}}
418_PKG_CREATE_ARGS+= -d ${_DESCR_FILE} 418_PKG_CREATE_ARGS+= -d ${_DESCR_FILE}
419_PKG_CREATE_ARGS+= -f ${_DEPENDS_PLIST} 419_PKG_CREATE_ARGS+= -f ${_DEPENDS_PLIST}
420_PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}} 420_PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}}
421_PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE} 421_PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE}
422_PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE} 422_PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE}
423_PKG_CREATE_ARGS+= ${"${CONFLICTS:M*}" != "":?-C ${CONFLICTS:Q}:} 423_PKG_CREATE_ARGS+= ${"${CONFLICTS:M*}" != "":?-C ${CONFLICTS:Q}:}