summaryrefslogtreecommitdiff
path: root/mk/extract
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-07-05 22:21:02 +0000
committerjlam <jlam@pkgsrc.org>2006-07-05 22:21:02 +0000
commitb8d23232b8a809ac454e7b3cd51ecea739bfea3f (patch)
treea30da33e80fce02ecc002e9c7ee00e2f7d9cda05 /mk/extract
parentf1e543002136be39ecf208cb90ccf6c25f65b2b0 (diff)
downloadpkgsrc-b8d23232b8a809ac454e7b3cd51ecea739bfea3f.tar.gz
Flatten out recursive makes into a single re-invocation of make by
introducing the concept of a "barrier". We separate the user-invokable targets into ones that must happen before the barrier, and ones that must happen after the barrier. The ones that happen after the barrier are run in a sub-make process. In this case, the targets that must be run after the barrier are from the "wrapper" step and beyond. We rewrite the various "flow" targets, e.g. wrapper, configure, build, etc., so that they of the right form to use the barrier target. This now completely removes the concept of PKG_PHASE from pkgsrc. It is replaced with the concept of "before" and "after" the barrier, and this state can be checked by testing for the existence of the barrier cookie file. Because we've removed most of the recursive makes, there is now nowhere to hook the PKG_ERROR_HANDLER.* commands, so remove them for now. As part of this commit, put back the logic that conditionalized the sources for the various cookie files. Because the sources are all "phony" targets, they were always run, regardless of whether or not the cookie file already existed. Now, if a cookie file exists, then that entire phase associated with that cookie file is skipped. Lastly, fix a thinko in configure/bsd.configure.mk where setting NO_CONFIGURE in a package Makefile would manage to skip the "wrapper" step altogether. Fix this by correctly noting "wrapper" and not "patch" as the preceding step to "configure".
Diffstat (limited to 'mk/extract')
-rw-r--r--mk/extract/extract.mk13
1 files changed, 9 insertions, 4 deletions
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk
index 257d21e2807..8ef2a36cad4 100644
--- a/mk/extract/extract.mk
+++ b/mk/extract/extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.8 2006/07/05 09:08:35 jlam Exp $
+# $NetBSD: extract.mk,v 1.9 2006/07/05 22:21:02 jlam Exp $
#
# The following variables may be set by the package Makefile and
# specify how extraction happens:
@@ -53,11 +53,11 @@ _EXTRACT_TARGETS+= release-extract-lock
.PHONY: extract
.if !target(extract)
-. if !exists(${_EXTRACT_COOKIE})
-extract: ${_EXTRACT_TARGETS}
-. else
+. if exists(${_EXTRACT_COOKIE})
extract:
@${DO_NADA}
+. else
+extract: ${_EXTRACT_TARGETS}
. endif
.endif
@@ -65,7 +65,12 @@ extract:
acquire-extract-lock: acquire-lock
release-extract-lock: release-lock
+.if exists(${_EXTRACT_COOKIE})
+${_EXTRACT_COOKIE}:
+ @${DO_NADA}
+.else
${_EXTRACT_COOKIE}: real-extract
+.endif
######################################################################
### real-extract (PRIVATE)