summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-05-21 19:53:59 +0000
committertnn <tnn@pkgsrc.org>2008-05-21 19:53:59 +0000
commit2d20e4b71e8c1a9c4c7a41ea61c358a92260d860 (patch)
treefad66ec1cc595a37d76548f5658e3b6d0d33d5a8
parentc94019feb11c38769879e10511324825cc1e3876 (diff)
downloadpkgsrc-2d20e4b71e8c1a9c4c7a41ea61c358a92260d860.tar.gz
Commit a workaround for the "make replace fails as non-root" bug:
Make sure _PKGSRC_BARRIER is set when using just-in-time su. I've been running this for a long time in my tree without ill effects. For more information see PR pkg/34470 and PR pkg/38505.
-rw-r--r--mk/bsd.pkg.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 1beff8002b0..939de298154 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1941 2008/04/03 14:07:51 joerg Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1942 2008/05/21 19:53:59 tnn Exp $
#
# This file is in the public domain.
#
@@ -643,7 +643,7 @@ ${.CURDIR}/${WRKDIR_BASENAME}:
_ROOT_CMD= cd ${.CURDIR} && \
${SETENV} ${PKGSRC_MAKE_ENV} \
PATH="$${PATH}:"${SU_CMD_PATH_APPEND:Q} \
- ${MAKE} ${MAKEFLAGS} \
+ ${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes \
PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL:Q} \
su-${.TARGET} ${MAKEFLAGS.su-${.TARGET}}