Prevent /etc/mk.conf from being included by BSD-style makefiles used by
packages themselves, as /etc/mk.conf may contain harmful settings for package builds. Just to clarify, /etc/mk.conf is still included by the Makefiles in pkgsrc, just not by the Makefiles used to build the software itself. This should fix pkg/15297 by gabriel rosenkoetter <gr@grappa.eclipsed.net>.
This commit is contained in:
parent
57a0d272cd
commit
a1d1eaa46e
1 changed files with 6 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.pkg.mk,v 1.915 2002/01/27 19:07:41 jlam Exp $
|
||||
# $NetBSD: bsd.pkg.mk,v 1.916 2002/01/27 20:01:56 jlam Exp $
|
||||
#
|
||||
# This file is in the public domain.
|
||||
#
|
||||
|
@ -20,6 +20,11 @@
|
|||
##### Include any preferences, if not already included, and common definitions
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
##### Prevent /etc/mk.conf from being included by a distribution's BSD-style
|
||||
##### Makefiles. We really don't want to pick up settings that are used by
|
||||
##### builds in /usr/src, e.g. DESTDIR.
|
||||
MAKE_ENV+= MAKECONF=/dev/null
|
||||
|
||||
##### Pass information about desired toolchain to package build.
|
||||
.if defined(USETOOLS)
|
||||
MAKE_ENV+= USETOOLS="${USETOOLS}"
|
||||
|
|
Loading…
Reference in a new issue