D3469.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3469.diff
View Options

	Index: head/Mk/bsd.options.mk
	===================================================================
	--- head/Mk/bsd.options.mk
	+++ head/Mk/bsd.options.mk
	@@ -100,6 +100,8 @@
	# get enabled too.
	# ${opt}_PREVENTS When opt is enabled, if any options in PREVENTS are
	# also enabled, it will produce an error.
	+# ${opt}_PREVENTS_MSG Provides a message explaining why the options
	+# cannot be selected together.
	#
	# ${opt}_USE= FOO=bar When option is enabled, it will enable
	# USE_FOO+= bar
	Index: head/Mk/bsd.port.mk
	===================================================================
	--- head/Mk/bsd.port.mk
	+++ head/Mk/bsd.port.mk
	@@ -5049,6 +5049,9 @@
	@${ECHO_MSG} "====> Two or more enabled options conflict with each other"
	. for prevents in ${OPTIONS_WRONG_PREVENTS}
	@${ECHO_MSG} "=====> Option ${prevents} conflicts with ${OPTIONS_WRONG_PREVENTS_${prevents}} (select only one)"
	+. if defined(${prevents}_PREVENTS_MSG)
	+ @${ECHO_MSG} "======> ${${prevents}_PREVENTS_MSG}"
	+. endif
	. endfor
	.endif
	.if !empty(OPTIONS_WRONG_MULTI) \|\| !empty(OPTIONS_WRONG_SINGLE) \|\| !empty(OPTIONS_WRONG_RADIO) \|\| !empty(OPTIONS_WRONG_PREVENTS)