pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg Preserve stdin for the bootstrap and ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eab8ae8f61f6
branches:  trunk
changeset: 449848:eab8ae8f61f6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Apr 06 18:46:06 2021 +0000

description:
Preserve stdin for the bootstrap and dependency handling like done for
normal dependencies.

diffstat:

 mk/pkgformat/pkg/depends.mk |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 0b4fc1a1475e -r eab8ae8f61f6 mk/pkgformat/pkg/depends.mk
--- a/mk/pkgformat/pkg/depends.mk       Tue Apr 06 18:29:51 2021 +0000
+++ b/mk/pkgformat/pkg/depends.mk       Tue Apr 06 18:46:06 2021 +0000
@@ -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 @@
 .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: ${_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:



Home | Main Index | Thread Index | Old Index