summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2004-09-11 07:26:03 +0000
committeragc <agc@pkgsrc.org>2004-09-11 07:26:03 +0000
commit46f829ac2e304b52cfb7cfb29dcde6d5511d3e9b (patch)
treeb423c2988c66bcce34c0ec5f2d66a2a0d03aa493 /mk
parent72c88baeefb02b124a65bbd8792dfd3a0280fe6e (diff)
downloadpkgsrc-46f829ac2e304b52cfb7cfb29dcde6d5511d3e9b.tar.gz
Finish off the locking work, by adding locks around "make install" and
"make package", from a nudge by Greg Oster. No objections, but lots of mail, received from pkgsrc developers, to committing this during the stability freeze, but I'd really like this to go in pkgsrc-2004Q3.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk16
1 files changed, 13 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 5a53f55ebf7..69be02896d8 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1496 2004/09/10 19:51:50 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1497 2004/09/11 07:26:03 agc Exp $
#
# This file is in the public domain.
#
@@ -2997,6 +2997,7 @@ show-shlib-type:
.PHONY: acquire-extract-lock acquire-patch-lock acquire-tools-lock
.PHONY: acquire-buildlink-lock acquire-configure-lock acquire-build-lock
+.PHONY: acquire-install-lock acquire-package-lock
acquire-extract-lock:
${_ACQUIRE_LOCK}
acquire-patch-lock:
@@ -3009,9 +3010,14 @@ acquire-configure-lock:
${_ACQUIRE_LOCK}
acquire-build-lock:
${_ACQUIRE_LOCK}
+acquire-install-lock:
+ ${_ACQUIRE_LOCK}
+acquire-package-lock:
+ ${_ACQUIRE_LOCK}
.PHONY: release-extract-lock release-patch-lock release-tools-lock
.PHONY: release-buildlink-lock release-configure-lock release-build-lock
+.PHONY: release-install-lock release-package-lock
release-extract-lock:
${_RELEASE_LOCK}
release-patch-lock:
@@ -3024,6 +3030,10 @@ release-configure-lock:
${_RELEASE_LOCK}
release-build-lock:
${_RELEASE_LOCK}
+release-install-lock:
+ ${_RELEASE_LOCK}
+release-package-lock:
+ ${_RELEASE_LOCK}
################################################################
# Skeleton targets start here
@@ -3077,12 +3087,12 @@ test: build ${TEST_COOKIE}
.PHONY: install
.if !target(install)
-install: uptodate-pkgtools ${_PKGSRC_BUILD_TARGETS} ${INSTALL_COOKIE}
+install: uptodate-pkgtools ${_PKGSRC_BUILD_TARGETS} acquire-install-lock ${INSTALL_COOKIE} release-install-lock
.endif
.PHONY: package
.if !target(package)
-package: uptodate-pkgtools install ${PACKAGE_COOKIE}
+package: uptodate-pkgtools install acquire-package-lock ${PACKAGE_COOKIE} release-package-lock
.endif
.PHONY: replace