diff options
| author | joerg <joerg@pkgsrc.org> | 2021-04-06 18:46:06 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2021-04-06 18:46:06 +0000 |
| commit | 42a479301f0d2a6d89faa84d3730b2c79b7e3d7f (patch) | |
| tree | 3b263e37c28774d2af6c8c2341ad74d8193068d3 | |
| parent | 9fea0f56ac5622da4db5ce6cd33241f4c1e17a50 (diff) | |
| download | pkgsrc-42a479301f0d2a6d89faa84d3730b2c79b7e3d7f.tar.gz | |
Preserve stdin for the bootstrap and dependency handling like done for
normal dependencies.
| -rw-r--r-- | mk/pkgformat/pkg/depends.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mk/pkgformat/pkg/depends.mk b/mk/pkgformat/pkg/depends.mk index 8081cad644c..c3d40d34889 100644 --- a/mk/pkgformat/pkg/depends.mk +++ b/mk/pkgformat/pkg/depends.mk @@ -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_TARGETS} .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-depends-lock 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: |