View | Details | Raw Unified | Return to bug 191144 | Differences between
and this patch

Collapse All | Expand All

(-)bsd.options.mk (+13 lines)
Lines 96-101 Link Here
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
(-)bsd.port.mk (+18 lines)
Lines 5361-5366 Link Here
5361
.  undef OPTNOCHECK
5361
.  undef OPTNOCHECK
5362
.endfor
5362
.endfor
5363
.undef multi
5363
.undef multi
5364
5365
.for opt in ${PORT_OPTIONS}
5366
.  for conflict in ${${opt}_PREVENTS}
5367
.    if ${PORT_OPTIONS:M${conflict}}
5368
.      if empty(OPTIONS_WRONG_PREVENTS:M${opt})
5369
OPTIONS_WRONG_PREVENTS+=	${opt}
5370
.      endif
5371
OPTIONS_WRONG_PREVENTS_${opt}+=	${conflict}
5372
.    endif
5373
.  endfor
5374
.endfor
5375
.undef conflict
5364
.undef opt
5376
.undef opt
5365
.endif #pre-check-config
5377
.endif #pre-check-config
5366
5378
Lines 5375-5380 Link Here
5375
.for radio in ${OPTIONS_WRONG_RADIO}
5387
.for radio in ${OPTIONS_WRONG_RADIO}
5376
	@${ECHO_MSG} "====> You cannot select multiple options from the ${radio} radio"
5388
	@${ECHO_MSG} "====> You cannot select multiple options from the ${radio} radio"
5377
.endfor
5389
.endfor
5390
.if defined(OPTIONS_WRONG_PREVENTS)
5391
	@${ECHO_MSG} "====> Two or more enabled options conflict with each other"
5392
.  for prevents in ${OPTIONS_WRONG_PREVENTS}
5393
	@${ECHO_MSG} "=====> Option ${prevents} conflicts with ${OPTIONS_WRONG_PREVENTS_${prevents}} (select only one)"
5394
.  endfor
5395
.endif
5378
.if !empty(OPTIONS_WRONG_MULTI) || !empty(OPTIONS_WRONG_SINGLE) || !empty(OPTIONS_WRONG_RADIO)
5396
.if !empty(OPTIONS_WRONG_MULTI) || !empty(OPTIONS_WRONG_SINGLE) || !empty(OPTIONS_WRONG_RADIO)
5379
_CHECK_CONFIG_ERROR=	true
5397
_CHECK_CONFIG_ERROR=	true
5380
.endif
5398
.endif

Return to bug 191144