Received: by mail.netbsd.org (Postfix, from userid 605) id 26BE184DA1; Tue, 6 Apr 2021 18:46:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5F46D84D9C for ; Tue, 6 Apr 2021 18:46:07 +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 x25a9bLjnjH7 for ; Tue, 6 Apr 2021 18:46:06 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DD82F84CF1 for ; Tue, 6 Apr 2021 18:46:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D15FFFA95; Tue, 6 Apr 2021 18:46:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_161773476696150" MIME-Version: 1.0 Date: Tue, 6 Apr 2021 18:46:06 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/mk/pkgformat/pkg To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20210406184606.D15FFFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_161773476696150 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue Apr 6 18:46:06 UTC 2021 Modified Files: pkgsrc/mk/pkgformat/pkg: depends.mk Log Message: Preserve stdin for the bootstrap and dependency handling like done for normal dependencies. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/mk/pkgformat/pkg/depends.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_161773476696150 Content-Disposition: inline Content-Length: 1464 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/pkgformat/pkg/depends.mk diff -u pkgsrc/mk/pkgformat/pkg/depends.mk:1.12 pkgsrc/mk/pkgformat/pkg/depends.mk:1.13 --- pkgsrc/mk/pkgformat/pkg/depends.mk:1.12 Wed Dec 2 10:22:39 2020 +++ pkgsrc/mk/pkgformat/pkg/depends.mk Tue Apr 6 18:46:06 2021 @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.12 2020/12/02 10:22:39 wiz Exp $ +# $NetBSD: depends.mk,v 1.13 2021/04/06 18:46:06 joerg Exp $ # This command prints out the dependency patterns for all full (run-time) # dependencies of the package. @@ -241,10 +241,11 @@ bootstrap-depends: ${_BOOTSTRAP_DEPENDS_ .PHONY: _pkgformat-bootstrap-depends .if empty(PKG_FAIL_REASON) _pkgformat-bootstrap-depends: - ${RUN}${_LIST_DEPENDS_CMD.bootstrap} | \ + ${RUN}exec 3<&0; \ + ${_LIST_DEPENDS_CMD.bootstrap} | \ while read type pattern dir; do \ ${TEST} "$$type" = "bootstrap" || continue; \ - ${_DEPENDS_INSTALL_CMD}; \ + ${_DEPENDS_INSTALL_CMD} 0<&3; \ done .else _pkgformat-bootstrap-depends: @@ -270,10 +271,11 @@ _TEST_DEPENDS_TARGETS+= release-test-dep test-depends: ${_TEST_DEPENDS_TARGETS} _pkgformat-test-depends: - ${RUN}${_LIST_DEPENDS_CMD.test} | \ + ${RUN}exec 3<&0; \ + ${_LIST_DEPENDS_CMD.test} | \ while read type pattern dir; do \ - ${TEST} "$$type" = "test" || continue; \ - ${_DEPENDS_INSTALL_CMD}; \ + ${TEST} "$$type" = "test" || continue; \ + ${_DEPENDS_INSTALL_CMD} 0<&3; \ done .PHONY: --_----------=_161773476696150--