diff options
| author | jlam <jlam> | 2006-07-05 09:08:35 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-05 09:08:35 +0000 |
| commit | d1472d7f01f507c9598f309eb5e7b4fc8708b4df (patch) | |
| tree | 266445424a702f9333f761cfa65f977c42683645 /mk/package | |
| parent | f79a4b39f76d9ac7a5341f7e80fe81cb3606ac86 (diff) | |
| download | pkgsrc-d1472d7f01f507c9598f309eb5e7b4fc8708b4df.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/package')
| -rw-r--r-- | mk/package/package.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mk/package/package.mk b/mk/package/package.mk index eb9fbc2df4b..9092236e188 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.9 2006/06/18 07:46:03 rillig Exp $ +# $NetBSD: package.mk,v 1.10 2006/07/05 09:08:35 jlam Exp $ ###################################################################### ### package (PUBLIC) @@ -6,6 +6,7 @@ ### package is a public target to generate a binary package. It will ### acquire elevated privileges just-in-time. ### +_PACKAGE_TARGETS+= check-vulnerable _PACKAGE_TARGETS+= install _PACKAGE_TARGETS+= acquire-package-lock _PACKAGE_TARGETS+= ${_PACKAGE_COOKIE} @@ -13,20 +14,20 @@ _PACKAGE_TARGETS+= release-package-lock .PHONY: package .if !target(package) +. if !exists(${_PACKAGE_COOKIE}) package: ${_PACKAGE_TARGETS} +. else +package: + @${DO_NADA} +. endif .endif .PHONY: acquire-package-lock release-package-lock acquire-package-lock: acquire-lock release-package-lock: release-lock -.if !exists(${_PACKAGE_COOKIE}) ${_PACKAGE_COOKIE}: ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${BUILD_ENV} ${MAKE} ${MAKEFLAGS} real-package PKG_PHASE=package -.else -${_PACKAGE_COOKIE}: - @${DO_NADA} -.endif ###################################################################### ### real-package (PRIVATE) @@ -54,7 +55,8 @@ package-message: ### .PHONY: package-cookie package-cookie: - ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} >> ${_PACKAGE_COOKIE} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_PACKAGE_COOKIE:H} + ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_PACKAGE_COOKIE} ###################################################################### ### The targets below are run with elevated privileges. |