Author: imp
Date: Fri Apr 18 17:04:26 2014
New Revision: 264663
URL: http://svnweb.freebsd.org/changeset/base/264663
Log:
Move the generic part of bsd.opts.mk into bsd.mkopts.mk to allow for
the WITH/WITHOUT_FOO -> MK_FOO={yes,no} stuff to be used elsewhere.
Added:
head/share/mk/bsd.mkopt.mk (contents, props changed)
Modified:
head/share/mk/bsd.opts.mk
Added: head/share/mk/bsd.mkopt.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/mk/bsd.mkopt.mk Fri Apr 18 17:04:26 2014 (r264663)
@@ -0,0 +1,40 @@
+#
+# $FreeBSD$
+#
+# Generic mechanism to deal with WITH and WITHOUT options and turn them into
MK_ options.
+#
+#
+# For each option FOO that defaults to YES, MK_FOO is set to yes, unless
WITHOUT_FOO
+# is defined, in which case it is set to no. If both WITH_FOO and WITHOUT_FOO
are
+# defined, WITHOUT_FOO wins. The list of default yes options is contained in
the
+# __DEFAULT_YES_OPTIONS variable, which is undefined after expansion.
+#
+# For each option FOO that defaults to NO, MK_FOO is set to no, unless WITH_FOO
+# is defined, in which case it is set to yes. If both WITH_FOO and WITHOUT_FOO
are
+# defined, WITH_FOO wins. The list of default no options is contained in the
+# __DEFAULT_NO_OPTIONS variable, which is undefined after expansion.
+#
+.for var in ${__DEFAULT_YES_OPTIONS}
+.if !defined(MK_${var})
+.if defined(WITHOUT_${var}) # IF both WITH and WITHOUT defined, WITHOUT
wins.
+MK_${var}:= no
+.else
+MK_${var}:= yes
+.endif
+.endif
+.endfor
+.undef __DEFAULT_YES_OPTIONS
+
+#
+# MK_* options which default to "no".
+#
+.for var in ${__DEFAULT_NO_OPTIONS}
+.if !defined(MK_${var})
+.if defined(WITH_${var}) # If both WITH and WITHOUT defined, WITH wins
+MK_${var}:= yes
+.else
+MK_${var}:= no
+.endif
+.endif
+.endfor
+.undef __DEFAULT_NO_OPTIONS
Modified: head/share/mk/bsd.opts.mk
==============================================================================
--- head/share/mk/bsd.opts.mk Fri Apr 18 17:04:18 2014 (r264662)
+++ head/share/mk/bsd.opts.mk Fri Apr 18 17:04:26 2014 (r264663)
@@ -243,34 +243,7 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG
__DEFAULT_YES_OPTIONS+=GCC GNUCXX GCC_BOOTSTRAP
.endif
-#
-# MK_* options which default to "yes".
-#
-.for var in ${__DEFAULT_YES_OPTIONS}
-.if !defined(MK_${var})
-.if defined(WITHOUT_${var})
-MK_${var}:= no
-.else
-MK_${var}:= yes
-.endif
-.endif
-.endfor
-.undef __DEFAULT_YES_OPTIONS
-
-#
-# MK_* options which default to "no".
-#
-.for var in ${__DEFAULT_NO_OPTIONS}
-.if !defined(MK_${var})
-.if defined(WITH_${var})
-MK_${var}:= yes
-.else
-MK_${var}:= no
-.endif
-.endif
-.endfor
-.undef __DEFAULT_NO_OPTIONS
-
+.include <bsd.mkopt.mk>
#
# Supported NO_* options (if defined, MK_* will be forced to "no",
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
