Attachment #154870 for bug #191144

Lines 96-101 Link Here

(-)bsd.options.mk (+13 lines)
96	# ${opt}_QMAKE_OFF When option is disabled, it will add its content to	96	# ${opt}_QMAKE_OFF When option is disabled, it will add its content to
97	# the QMAKE_ARGS.	97	# the QMAKE_ARGS.
98	#	98	#
		99	# ${opt}_IMPLIES When opt is enabled, options named in IMPLIES will
		100	# get enabled too.
		101	# ${opt}_PREVENTS When opt is enabled, if any options in PREVENTS are
		102	# also enabled, it will produce an error.
		103	#
99	# ${opt}_USE= FOO=bar When option is enabled, it will enable	104	# ${opt}_USE= FOO=bar When option is enabled, it will enable
100	# USE_FOO+= bar	105	# USE_FOO+= bar
101	# If you need more than one option, you can do	106	# If you need more than one option, you can do
Lines 387-392 Link Here
387	NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}	392	NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}}
388	.endfor	393	.endfor
389		394
		395	## Enable options implied by other options
		396	# _PREVENTS is handled in bsd.port.mk:pre-check-config
		397	.for count in ${PORT_OPTIONS}
		398	. for opt in ${PORT_OPTIONS}
		399	PORT_OPTIONS+= ${${opt}_IMPLIES}
		400	. endfor
		401	.endfor
		402
390	# Finally, add options required by slave ports	403	# Finally, add options required by slave ports
391	PORT_OPTIONS+= ${OPTIONS_SLAVE}	404	PORT_OPTIONS+= ${OPTIONS_SLAVE}
392		405

Lines 5355-5360 Link Here

(-)bsd.port.mk (+16 lines)
5355	. undef OPTNOCHECK	5355	. undef OPTNOCHECK
5356	.endfor	5356	.endfor
5357	.undef multi	5357	.undef multi
		5358
		5359	.for opt in ${PORT_OPTIONS}
		5360	. for conflict in ${${opt}_PREVENTS}
		5361	. if ${PORT_OPTIONS:M${conflict}}
		5362	. if empty(OPTIONS_WRONG_PREVENTS:M${opt})
		5363	OPTIONS_WRONG_PREVENTS+= ${opt}
		5364	. endif
		5365	OPTIONS_WRONG_PREVENTS_${opt}+= ${conflict}
		5366	. endif
		5367	. endfor
		5368	.endfor
		5369	.undef conflict
5358	.undef opt	5370	.undef opt
5359	.endif #pre-check-config	5371	.endif #pre-check-config
5360		5372
Lines 5369-5374 Link Here
5369	.for radio in ${OPTIONS_WRONG_RADIO}	5381	.for radio in ${OPTIONS_WRONG_RADIO}
5370	@${ECHO_MSG} "====> You cannot select multiple options from the ${radio} radio"	5382	@${ECHO_MSG} "====> You cannot select multiple options from the ${radio} radio"
5371	.endfor	5383	.endfor
		5384	.for prevents in ${OPTIONS_WRONG_PREVENTS}
		5385	@${ECHO_MSG} -n "====> Option ${prevents} conflicts with ${OPTIONS_WRONG_PREVENTS_${prevents}}."
		5386	@${ECHO_MSG} " You may select only one of them"
		5387	.endfor
5372	.if !empty(OPTIONS_WRONG_MULTI) \|\| !empty(OPTIONS_WRONG_SINGLE) \|\| !empty(OPTIONS_WRONG_RADIO)	5388	.if !empty(OPTIONS_WRONG_MULTI) \|\| !empty(OPTIONS_WRONG_SINGLE) \|\| !empty(OPTIONS_WRONG_RADIO)
5373	_CHECK_CONFIG_ERROR= true	5389	_CHECK_CONFIG_ERROR= true
5374	.endif	5390	.endif

Return to bug 191144