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

All the NO_foo options processed in src.opts.mk are really bsd.opts.mk

Browse Source 
options, so move their processing there. This fixes issues with
Makefiles that define NO_MAN=t and only inlcude bsd.*.mk files. A few
ports fell into this category, and they should be fixed by this change.
Also, for now, disable the warning about NO_foo being deprecated. More
work is needed than anticipated before we can do that, so kill the
noise for now.
This commit is contained in:
Warner Losh 2014-05-07 18:14:56 +00:00
parent 7a61fc5a8e
commit 5d420b97e6
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
share/mk/bsd.opts.mk
View File

@ -65,6 +65,25 @@ __DEFAULT_NO_OPTIONS = \
.include <bsd.mkopt.mk>
#
# Supported NO_* options (if defined, MK_* will be forced to "no",
# regardless of user's setting).
#
# These are transitional and will disappaer in the FreeBSD 12.
#
.for var in \
CTF \
DEBUG_FILES \
INSTALLLIB \
MAN \
PROFILE
.if defined(NO_${var})
# This warning may be premature...
#.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
MK_${var}:=no
.endif
.endfor
.endif # !_WITHOUT_SRCCONF
.endif

18
share/mk/src.opts.mk
View File

@ -230,24 +230,6 @@ __DEFAULT_YES_OPTIONS+=GCC GNUCXX GCC_BOOTSTRAP
.include <bsd.mkopt.mk>
#
# Supported NO_* options (if defined, MK_* will be forced to "no",
# regardless of user's setting).
#
# These are transitional and will disappaer in the FreeBSD 12.
#
.for var in \
CTF \
DEBUG_FILES \
INSTALLLIB \
MAN \
PROFILE
.if defined(NO_${var})
.warning "NO_${var} is defined, but deprecated. Please use MK_${var}=no instead."
MK_${var}:=no
.endif
.endfor
#
# MK_* options that default to "yes" if the compiler is a C++11 compiler.
#