summaryrefslogtreecommitdiff
path: root/mk/wrapper/bsd.wrapper.mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-10-21 11:42:25 +0000
committerrillig <rillig@pkgsrc.org>2006-10-21 11:42:25 +0000
commit837c83c041c1ea4c97566a983efd147b47c78aca (patch)
tree183e33b5d1ed0cf0f5da1d12ccb5299bc9043bd4 /mk/wrapper/bsd.wrapper.mk
parentd803961ee92a4e42af3cebf4981293e274c3e8d0 (diff)
downloadpkgsrc-837c83c041c1ea4c97566a983efd147b47c78aca.tar.gz
Fixed the "inconsistent update" problem when using the pkgsrc wrapper
cache together with MAKE_FLAGS=-j. The cache file is now regenerated into a temporary file and then renamed (atomically) to the "real" cache file. Fixed some code that would fail when run in "set -e" mode. If you want to test the "set -e" mode, just uncomment the line in wrapper.sh.
Diffstat (limited to 'mk/wrapper/bsd.wrapper.mk')
-rw-r--r--mk/wrapper/bsd.wrapper.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index f423cee8aec..24e8df1dd8f 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.54 2006/10/21 10:01:23 rillig Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.55 2006/10/21 11:42:25 rillig Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -343,6 +343,7 @@ _WRAP_SUBST_SED= \
-e "s|@CAT@|${CAT:Q}|g" \
-e "s|@ECHO@|${ECHO:Q}|g" \
-e "s|@EXPR@|${EXPR:Q}|g" \
+ -e "s|@MV@|${MV}|g" \
-e "s|@SED@|${SED:Q}|g" \
-e "s|@TEST@|${TEST:Q}|g" \
-e "s|@WRAPPER_SHELL@|${WRAPPER_SHELL:Q}|g" \