Date: Wed, 7 May 2014 18:14:56 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265580 - head/share/mk Message-ID: <201405071814.s47IEuh2010806@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed May 7 18:14:56 2014 New Revision: 265580 URL: http://svnweb.freebsd.org/changeset/base/265580 Log: All the NO_foo options processed in src.opts.mk are really bsd.opts.mk 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. Modified: head/share/mk/bsd.opts.mk head/share/mk/src.opts.mk Modified: head/share/mk/bsd.opts.mk ============================================================================== --- head/share/mk/bsd.opts.mk Wed May 7 17:33:31 2014 (r265579) +++ head/share/mk/bsd.opts.mk Wed May 7 18:14:56 2014 (r265580) @@ -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 Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Wed May 7 17:33:31 2014 (r265579) +++ head/share/mk/src.opts.mk Wed May 7 18:14:56 2014 (r265580) @@ -231,24 +231,6 @@ __DEFAULT_YES_OPTIONS+=GCC GNUCXX GCC_BO .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. # .include <bsd.compiler.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405071814.s47IEuh2010806>