diff options
| author | joerg <joerg@pkgsrc.org> | 2007-05-22 17:30:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-05-22 17:30:54 +0000 |
| commit | fcc23edafa829bf1f11f31acc0fab69221e95cc1 (patch) | |
| tree | 5ba6f163353ad9e35f4482f3c109e819792a31e3 /mk | |
| parent | 7204da57da36d41e6fe81d24ccea979182e9d029 (diff) | |
| download | pkgsrc-fcc23edafa829bf1f11f31acc0fab69221e95cc1.tar.gz | |
Fix a small logic bug. When running install-dependencies for the first
time for bootstrap-dependencies, only really only look at the bootstrap
dependencies. Skip them in the second run.
Confusion reported by xtraeme@
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/depends.mk | 6 | ||||
| -rwxr-xr-x | mk/flavor/pkg/install-dependencies | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index 1e74fddeceb..52210ea5296 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.27 2007/05/22 16:17:16 joerg Exp $ +# $NetBSD: depends.mk,v 1.28 2007/05/22 17:30:54 joerg Exp $ # This command prints out the dependency patterns for all full (run-time) # dependencies of the package. @@ -64,8 +64,6 @@ _INSTALL_DEPENDS_CMD= \ SETENV=${SETENV:Q} \ ${SH} ${PKGSRCDIR}/mk/flavor/pkg/install-dependencies -bootstrap-depends: ${_DEPENDS_FILE} - ${_DEPENDS_FILE}: ${RUN} ${MKDIR} ${.TARGET:H} ${RUN} ${_LIST_DEPENDS_CMD} > ${.TARGET} @@ -82,7 +80,7 @@ _flavor-list-dependencies: .PHONY ${_DEPENDS_FILE} # Installs any missing dependencies. # _flavor-install-dependencies: .PHONY ${_DEPENDS_FILE} - ${RUN}${_INSTALL_DEPENDS_CMD} + ${RUN}${_INSTALL_DEPENDS_CMD} no-bootstrap # _flavor-post-install-dependencies: # Targets after installing all dependencies. diff --git a/mk/flavor/pkg/install-dependencies b/mk/flavor/pkg/install-dependencies index 7db98c2a7db..573e7c1113b 100755 --- a/mk/flavor/pkg/install-dependencies +++ b/mk/flavor/pkg/install-dependencies @@ -27,12 +27,6 @@ unset _DEPENDS_FILE PKGNAME=${_PKGNAME} unset _PKGNAME -if [ $# = 1 ]; then - type_filter=$1 -else - type_filter=all -fi - error_msg() { ${ECHO} "ERROR:" "$*" 1>&2 } @@ -46,7 +40,11 @@ find_best() { } ${CAT} ${DEPENDS_FILE} | while read type pattern dir; do - [ $type_filter != all ] && [ $type_filter = "$filter" ] && continue + if $TEST "$1" = "bootstrap"; then + $TEST "$type" != "bootstrap" && continue + else + $TEST "$type" = "bootstrap" && continue + fi pkg=`find_best "$pattern"` case "$pkg" in "") |