Try harder to not leak src/ build stuff into ports/ environment
by not exposing the MK_* variables that were designed for src/. Requested by: many
This commit is contained in:
parent
7850265edd
commit
8ef03c79e1
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=164411
@ -104,10 +104,12 @@
|
||||
.if !target(__<bsd.own.mk>__)
|
||||
__<bsd.own.mk>__:
|
||||
|
||||
.if !defined(_WITHOUT_SRCCONF)
|
||||
SRCCONF?= /etc/src.conf
|
||||
.if exists(${SRCCONF})
|
||||
.include "${SRCCONF}"
|
||||
.endif
|
||||
.endif
|
||||
|
||||
# Binaries
|
||||
BINOWN?= root
|
||||
@ -170,6 +172,7 @@ STRIP?= -s
|
||||
COMPRESS_CMD?= gzip -cn
|
||||
COMPRESS_EXT?= .gz
|
||||
|
||||
.if !defined(_WITHOUT_SRCCONF)
|
||||
#
|
||||
# Define MK_* variables (which are either "yes" or "no") for users
|
||||
# to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
|
||||
@ -448,5 +451,6 @@ MK_${var}_SUPPORT:= no
|
||||
MK_${var}_SUPPORT:= yes
|
||||
.endif
|
||||
.endfor
|
||||
.endif # !_WITHOUT_SRCCONF
|
||||
|
||||
.endif # !target(__<bsd.own.mk>__)
|
||||
|
@ -3,8 +3,9 @@
|
||||
PORTSDIR?= /usr/ports
|
||||
BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk
|
||||
|
||||
# Needed to keep bsd.own.mk from reading in /etc/src.conf when building ports.
|
||||
SRCCONF= /dev/null
|
||||
# Needed to keep bsd.own.mk from reading in /etc/src.conf
|
||||
# and setting MK_* variables when building ports.
|
||||
_WITHOUT_SRCCONF=
|
||||
|
||||
.include <bsd.own.mk>
|
||||
.include "${BSDPORTMK}"
|
||||
|
Loading…
Reference in New Issue
Block a user