d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try harder to not leak src/ build stuff into ports/ environment

Browse Source 
by not exposing the MK_* variables that were designed for src/.

Requested by:	many
This commit is contained in:
ru 2006-11-19 16:28:52 +00:00
parent 2b14cadbaf
commit 5a9798235e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/mk/bsd.own.mk
View File

@ -104,10 +104,12 @@
.if !target(__<bsd.own.mk>__) .if !target(__<bsd.own.mk>__)
__<bsd.own.mk>__: __<bsd.own.mk>__:
.if !defined(_WITHOUT_SRCCONF)
SRCCONF?= /etc/src.conf SRCCONF?= /etc/src.conf
.if exists(${SRCCONF}) .if exists(${SRCCONF})
.include "${SRCCONF}" .include "${SRCCONF}"
.endif .endif
.endif
# Binaries # Binaries
BINOWN?= root BINOWN?= root
@ -170,6 +172,7 @@ STRIP?= -s
COMPRESS_CMD?= gzip -cn COMPRESS_CMD?= gzip -cn
COMPRESS_EXT?= .gz COMPRESS_EXT?= .gz
.if !defined(_WITHOUT_SRCCONF)
# #
# Define MK_* variables (which are either "yes" or "no") for users # Define MK_* variables (which are either "yes" or "no") for users
# to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the # 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 MK_${var}_SUPPORT:= yes
.endif .endif
.endfor .endfor
.endif # !_WITHOUT_SRCCONF
.endif # !target(__<bsd.own.mk>__) .endif # !target(__<bsd.own.mk>__)

5
share/mk/bsd.port.mk
View File

@ -3,8 +3,9 @@
PORTSDIR?= /usr/ports PORTSDIR?= /usr/ports
BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk BSDPORTMK?= ${PORTSDIR}/Mk/bsd.port.mk
# Needed to keep bsd.own.mk from reading in /etc/src.conf when building ports. # Needed to keep bsd.own.mk from reading in /etc/src.conf
SRCCONF= /dev/null # and setting MK_* variables when building ports.
_WITHOUT_SRCCONF=
.include <bsd.own.mk> .include <bsd.own.mk>
.include "${BSDPORTMK}" .include "${BSDPORTMK}"