Author: imp
Date: Mon Feb  9 16:03:55 2015
New Revision: 278457
URL: https://svnweb.freebsd.org/changeset/base/278457

Log:
  Enforce that MK_foo options shall be either "yes" or "no" and nothing
  else.

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  Mon Feb  9 15:58:27 2015        (r278456)
+++ head/share/mk/bsd.mkopt.mk  Mon Feb  9 16:03:55 2015        (r278457)
@@ -33,7 +33,11 @@ MK_${var}:=  no
 .else
 MK_${var}:=    yes
 .endif
+.else
+.if ${MK_${var}} != "yes" && ${MK_${var}} != "no"
+.error "Illegal value for MK_${var}: ${MK_${var}}"
 .endif
+.endif # !defined(MK_${var})
 .endfor
 .undef __DEFAULT_YES_OPTIONS
 
@@ -47,6 +51,10 @@ MK_${var}:=  yes
 .else
 MK_${var}:=    no
 .endif
+.else
+.if ${MK_${var}} != "yes" && ${MK_${var}} != "no"
+.error "Illegal value for MK_${var}: ${MK_${var}}"
 .endif
+.endif # !defined(MK_${var})
 .endfor
 .undef __DEFAULT_NO_OPTIONS

Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk  Mon Feb  9 15:58:27 2015        (r278456)
+++ head/sys/conf/kern.opts.mk  Mon Feb  9 16:03:55 2015        (r278457)
@@ -58,7 +58,11 @@ MK_${var}:=  no
 .else
 MK_${var}:=    yes
 .endif
+.else
+.if ${MK_${var}} != "yes" && ${MK_${var}} != "no"
+.error "Illegal value for MK_${var}: ${MK_${var}}"
 .endif
+.endif # !defined(MK_${var})
 .endfor
 .undef __DEFAULT_YES_OPTIONS
 
@@ -70,7 +74,11 @@ MK_${var}:=  yes
 .else
 MK_${var}:=    no
 .endif
+.else
+.if ${MK_${var}} != "yes" && ${MK_${var}} != "no"
+.error "Illegal value for MK_${var}: ${MK_${var}}"
 .endif
+.endif # !defined(MK_${var})
 .endfor
 .undef __DEFAULT_NO_OPTIONS
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to