diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-05 09:08:35 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-05 09:08:35 +0000 |
| commit | 990d0b53771974e8526315776af82fd9b4961c14 (patch) | |
| tree | 266445424a702f9333f761cfa65f977c42683645 /mk/wrapper/bsd.wrapper.mk | |
| parent | e3b97d774b9eb87dcd011ba0aeca7f60d35eeb86 (diff) | |
| download | pkgsrc-990d0b53771974e8526315776af82fd9b4961c14.tar.gz | |
Make the check-vulnerable target more self-sufficient, by moving some
of the logic from fetch/fetch.mk into flavor/pkg/check.mk, so that
check-vulnerable can be used as a source target.
Make check-vulnerable a source target for every phase of the build
workflow, which ensures that it is always run if the user starts a
new phase from the command line.
Fix the cookie-generation targets so that they don't append, only
overwrite to the cookie file. This works around potential problems
due to recursive makes.
Move the cookie checks so that they surround the corresponding phase
target. The presence of the cookie should now inform the make process
to avoid doing any processing of phases that occur before the phase
corresponding to the cookie.
Diffstat (limited to 'mk/wrapper/bsd.wrapper.mk')
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index cf76bc799ef..d8e3f2eb1aa 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.43 2006/07/05 06:09:15 jlam Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.44 2006/07/05 09:08:35 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -779,8 +779,11 @@ _WRAPPER_COOKIE= ${WRKDIR}/.wrapper_done .if !target(wrapper) . if defined(NO_BUILD) wrapper: patch wrapper-cookie +. elif !exists(${_WRAPPER_COOKIE}) +wrapper: check-vulnerable patch acquire-wrapper-lock ${_WRAPPER_COOKIE} release-wrapper-lock . else -wrapper: patch acquire-wrapper-lock ${_WRAPPER_COOKIE} release-wrapper-lock +wrapper: + @${DO_NADA} . endif .endif @@ -788,13 +791,8 @@ wrapper: patch acquire-wrapper-lock ${_WRAPPER_COOKIE} release-wrapper-lock acquire-wrapper-lock: acquire-lock release-wrapper-lock: release-lock -.if !exists(${_WRAPPER_COOKIE}) ${_WRAPPER_COOKIE}: ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-wrapper PKG_PHASE=wrapper -.else -${_WRAPPER_COOKIE}: - @${DO_NADA} -.endif .PHONY: real-wrapper real-wrapper: wrapper-message wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie error-check @@ -823,4 +821,4 @@ post-wrapper: .PHONY: wrapper-cookie wrapper-cookie: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_WRAPPER_COOKIE:H} - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} >> ${_WRAPPER_COOKIE} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_WRAPPER_COOKIE} |