diff options
| author | tron <tron> | 2013-06-05 08:19:57 +0000 |
|---|---|---|
| committer | tron <tron> | 2013-06-05 08:19:57 +0000 |
| commit | e6bfa38dfdb37c4509d79e49846107b53cdbb97d (patch) | |
| tree | 88f8ec97959aa88490d648dc6e7dfcf0e142e20b /mk/bsd.pkg.mk | |
| parent | a92bfae60e7c3252da071aba2f534e896050a990 (diff) | |
| download | pkgsrc-e6bfa38dfdb37c4509d79e49846107b53cdbb97d.tar.gz | |
Revert change to "PKG_SETENV":
1.) It breaks the build of "www/firefox" which gets upset if "SHELL" is
not defined in the environment. There are probably more packages
which similar problems.
2.) It breaks established use case like this one:
export ALLOW_VULNERABLE_PACKAGES=yes
cd pkgsrc/multimedia/ffmpeg2theora
bmake install
In this case the value of "ALLOW_VULNERABLE_PACKAGES" will not be
passed to the build of "pkgsrc/multimedia/ffmpeg". And the build of
this package will fail due to known vulnerabilities.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 9ddae178890..619a8713af6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1991 2013/06/03 23:27:14 riastradh Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1992 2013/06/05 08:19:57 tron Exp $ # # This file is in the public domain. # @@ -153,7 +153,11 @@ ${_var_}+= ${${_var_}.*} CPPFLAGS+= ${CPP_PRECOMP_FLAGS} -PKGSRC_SETENV?= ${SETENV} -i +# To sanitise environment set PKGSRC_SETENV=${SETENV} -i +# This will however cause build failures (e.g. "www/firefox"). Settings +# like "ALLOW_VULNERABLE_PACKAGES" will also not be correctly passed +# to dependence builds. +PKGSRC_SETENV?= ${SETENV} ALL_ENV+= CC=${CC:Q} ALL_ENV+= CFLAGS=${CFLAGS:M*:Q} |