diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-25 18:04:25 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-25 18:04:25 +0000 |
| commit | f065d908d037622433aa516f7e51660612219392 (patch) | |
| tree | cc44629e3c8f2c22ffedb1bf0a53532b4a39edd1 /mk | |
| parent | 39a1ae52e340628a021f3dfad16ab19e305874be (diff) | |
| download | pkgsrc-f065d908d037622433aa516f7e51660612219392.tar.gz | |
Move barrier to just after the depends phase. This allows both the
"tools" and "wrapper" phases to be able to expect all the dependencies
to be installed already.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.barrier.mk | 7 | ||||
| -rw-r--r-- | mk/tools/bsd.tools.mk | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/bsd.pkg.barrier.mk b/mk/bsd.pkg.barrier.mk index 9cbdeccb7a5..02fde5712c6 100644 --- a/mk/bsd.pkg.barrier.mk +++ b/mk/bsd.pkg.barrier.mk @@ -1,18 +1,19 @@ -# $NetBSD: bsd.pkg.barrier.mk,v 1.9 2006/07/22 16:31:35 jlam Exp $ +# $NetBSD: bsd.pkg.barrier.mk,v 1.10 2006/07/25 18:04:25 jlam Exp $ _COOKIE.barrier= ${WRKDIR}/.barrier_cookie # _BARRIER_PRE_TARGETS is a list of the targets that must be built before # the "barrier" target invokes a new make. # -_BARRIER_PRE_TARGETS= tools +_BARRIER_PRE_TARGETS= checksum makedirs depends # _BARRIER_POST_TARGETS is a list of the targets that must be built after # the "barrier" target invokes a new make. This list is specially # ordered so that if more than one is specified on the command-line, # then pkgsrc will still do the right thing. # -_BARRIER_POST_TARGETS= wrapper +_BARRIER_POST_TARGETS= tools +_BARRIER_POST_TARGETS+= wrapper _BARRIER_POST_TARGETS+= extract _BARRIER_POST_TARGETS+= patch _BARRIER_POST_TARGETS+= configure diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk index 81d9fb90995..2d81b4e63af 100644 --- a/mk/tools/bsd.tools.mk +++ b/mk/tools/bsd.tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.44 2006/07/21 14:21:28 jlam Exp $ +# $NetBSD: bsd.tools.mk,v 1.45 2006/07/25 18:04:25 jlam Exp $ # # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -63,9 +63,6 @@ _COOKIE.tools= ${WRKDIR}/.tools_done ### specified by USE_TOOLS. ### _TOOLS_TARGETS+= check-vulnerable -_TOOLS_TARGETS+= checksum -_TOOLS_TARGETS+= makedirs -_TOOLS_TARGETS+= depends _TOOLS_TARGETS+= acquire-tools-lock _TOOLS_TARGETS+= ${_COOKIE.tools} _TOOLS_TARGETS+= release-tools-lock @@ -75,8 +72,10 @@ _TOOLS_TARGETS+= release-tools-lock . if exists(${_COOKIE.tools}) tools: @${DO_NADA} -. else +. elif defined(_PKGSRC_BARRIER) tools: ${_TOOLS_TARGETS} +. else +tools: barrier . endif .endif |