From 1ad19bede674339968de3b62189eabb21ed3f511 Mon Sep 17 00:00:00 2001 From: abs Date: Thu, 8 Sep 2011 20:17:15 +0000 Subject: Introduce PKGSRC_SETENV, defaulting to SETENV. Can be set to ${SETENV} -i to santise environment --- mk/bsd.pkg.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mk/bsd.pkg.mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8fdbf22308d..9f7f23ab822 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1977 2011/03/12 14:07:13 wiz Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1978 2011/09/08 20:17:15 abs Exp $ # # This file is in the public domain. # @@ -151,6 +151,9 @@ ${_var_}+= ${${_var_}.*} CPPFLAGS+= ${CPP_PRECOMP_FLAGS} +# To sanitise environment set PKGSRC_SETENV=${SETENV} -i +PKGSRC_SETENV= ${SETENV} + ALL_ENV+= CC=${CC:Q} ALL_ENV+= CFLAGS=${CFLAGS:M*:Q} ALL_ENV+= CPPFLAGS=${CPPFLAGS:M*:Q} @@ -600,7 +603,7 @@ ${.CURDIR}/${WRKDIR_BASENAME}: # XXX: Shouldn't the $${PATH} be ${PATH} here? This may be related to # PR 34470. _ROOT_CMD= cd ${.CURDIR} && \ - ${SETENV} ${PKGSRC_MAKE_ENV} \ + ${PKGSRC_SETENV} ${PKGSRC_MAKE_ENV} \ PATH="$${PATH}:"${SU_CMD_PATH_APPEND:Q} \ ${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes \ PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL:Q} \ -- cgit v1.2.3