svn commit: r280727 - in head: share/mk sys/conf

[Warner Losh]

Author: imp
Date: Fri Mar 27 02:35:11 2015
New Revision: 280727
URL: https://svnweb.freebsd.org/changeset/base/280727

Log:
  Add support for specifying unsupported / broken options that override
  any defaults or user specified actions on the command line. This would
  be useful for specifying features that are always broken or that
  cannot make sense on a specific architecture, like ACPI on pc98 or
  EISA on !i386 (!x86 usage of EISA is broken and there's no supported
  hardware that could have it in any event). Any items in
  __ALWAYS_NO_OPTIONS are forced to "no" regardless of other settings.
  
  Differential Revision: https://reviews.freebsd.org/D2011

Modified:
  head/share/mk/bsd.mkopt.mk
  head/sys/conf/kern.opts.mk

Modified: head/share/mk/bsd.mkopt.mk
==============================================================================
--- head/share/mk/bsd.mkopt.mk	Fri Mar 27 02:01:22 2015	(r280726)
+++ head/share/mk/bsd.mkopt.mk	Fri Mar 27 02:35:11 2015	(r280727)
@@ -67,6 +67,15 @@ MK_${var}:=	no
 # MK_* options which are always no, usually because they are
 # unsupported/badly broken on this architecture.
 #
+.for var in ${__ALWAYS_NO_OPTIONS}
+MK_${var}:=	no
+.endfor
+.undef __ALWAYS_NO_OPTIONS
+
+#
+# MK_* options which are always no, usually because they are
+# unsupported/badly broken on this architecture.
+#
 .for var in ${BROKEN_OPTIONS}
 MK_${var}:=	no
 .endfor

Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk	Fri Mar 27 02:01:22 2015	(r280726)
+++ head/sys/conf/kern.opts.mk	Fri Mar 27 02:35:11 2015	(r280727)
@@ -120,6 +120,16 @@ MK_${var}:=	no
 #end of bsd.mkopt.mk expanded inline.
 
 #
+# MK_* options which are always no, usually because they are
+# unsupported/badly broken on this architecture.
+#
+.for var in ${__ALWAYS_NO_OPTIONS}
+MK_${var}:=	no
+.endfor
+.undef __ALWAYS_NO_OPTIONS
+#end of bsd.mkopt.mk expanded inline.
+
+#
 # MK_*_SUPPORT options which default to "yes" unless their corresponding
 # MK_* variable is set to "no".
 #