From 4f34ebeaf507f31b9f71e7e14bf3b83defa6575f Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 29 May 2007 15:26:25 +0000 Subject: * Move the meat of the bootstrap-depends target entirely within the lock, which I think is what was originally intended. * Avoid creating ${WRKDIR}/.depends when running the bootstrap-depends target, which is run as part of running the fetch target. We still create the .depends file later when we need it. XXX Note that there are still problems when locking occurs because locks XXX are created in ${WRKDIR}, so running "bootstrap-depends" as a source XXX for "fetch" will still cause the work directory to be created and XXX populated with files. This probably needs to be solved by using a XXX different location for the lockfile, e.g. ${TMPDIR}, for the XXX bootstrap-depends step. --- mk/flavor/pkg/depends.mk | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mk/flavor/pkg/depends.mk b/mk/flavor/pkg/depends.mk index 94b74b45fe0..31dc9d6826e 100644 --- a/mk/flavor/pkg/depends.mk +++ b/mk/flavor/pkg/depends.mk @@ -1,4 +1,4 @@ -# $NetBSD: depends.mk,v 1.34 2007/05/28 11:07:00 martti Exp $ +# $NetBSD: depends.mk,v 1.35 2007/05/29 15:26:25 jlam Exp $ # This command prints out the dependency patterns for all full (run-time) # dependencies of the package. @@ -46,6 +46,12 @@ _LIST_DEPENDS_CMD= \ " "${BUILD_DEPENDS:Q} \ " "${DEPENDS:Q} +_LIST_DEPENDS_CMD.bootstrap= \ + ${SETENV} AWK=${AWK:Q} PKG_ADMIN=${PKG_ADMIN:Q} \ + PKGSRCDIR=${PKGSRCDIR:Q} PWD_CMD=${PWD_CMD:Q} SED=${SED:Q} \ + ${SH} ${PKGSRCDIR}/mk/flavor/pkg/list-dependencies \ + " "${BOOTSTRAP_DEPENDS:Q} " " " " + _RESOLVE_DEPENDS_CMD= \ ${SETENV} _PKG_DBDIR=${_PKG_DBDIR:Q} PKG_ADMIN=${PKG_ADMIN:Q} \ _DEPENDS_FILE=${_DEPENDS_FILE:Q} \ @@ -128,11 +134,14 @@ _flavor-post-install-dependencies: .PHONY ${_RDEPENDS_FILE} ### .PHONY: bootstrap-depends _BOOTSTRAP_DEPENDS_TARGETS+= acquire-bootstrap-depends-lock -_BOOTSTRAP_DEPENDS_TARGETS+= ${_DEPENDS_FILE} +_BOOTSTRAP_DEPENDS_TARGETS+= _flavor-bootstrap-depends _BOOTSTRAP_DEPENDS_TARGETS+= release-bootstrap-depends-lock bootstrap-depends: ${_BOOTSTRAP_DEPENDS_TARGETS} - ${RUN}${CAT} ${_DEPENDS_FILE} | \ + +.PHONY: _flavor-bootstrap-depends +_flavor-bootstrap-depends: + ${RUN}${_LIST_DEPENDS_CMD.bootstrap} | \ while read type pattern dir; do \ ${TEST} "$$type" != "bootstrap" && continue; \ ${_DEPENDS_INSTALL_CMD}; \ -- cgit v1.2.3