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

Collapse All | Expand All

(-)bsd.options.mk (+20 lines)
Lines 95-100 Link Here
95
# ${opt}_QMAKE_OFF		When option is disabled, it will add its content to
95
# ${opt}_QMAKE_OFF		When option is disabled, it will add its content to
96
#				the QMAKE_ARGS.
96
#				the QMAKE_ARGS.
97
#
97
#
98
# ${opt}_ENABLES		When opt is enabled, options named in ENABLES will
99
# 				get enabled too
100
# ${opt}_PREVENTS		When opt is enabled, if any options in PREVENTS are
101
# 				enabled, it will produce an error
98
# ${opt}_USE=	FOO=bar		When option is enabled, it will  enable
102
# ${opt}_USE=	FOO=bar		When option is enabled, it will  enable
99
#				USE_FOO+= bar
103
#				USE_FOO+= bar
100
#				If you need more than one option, you can do
104
#				If you need more than one option, you can do
Lines 383-388 Link Here
383
NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
387
NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
384
.endfor
388
.endfor
385
389
390
# Enable options implied by other options
391
.for count in ${PORT_OPTIONS}
392
.  for opt in ${PORT_OPTIONS}
393
PORT_OPTIONS+=	${${opt}_ENABLES}
394
.  endfor
395
.endfor
396
397
# Prevent options that conflict
398
.for opt in ${PORT_OPTIONS}
399
.  for conflict in ${${opt}_PREVENTS}
400
.    if ${PORT_OPTIONS:M${conflict}}
401
IGNORE=	Option ${conflict} conflicts with option ${opt}
402
.    endif
403
.  endfor
404
.endfor
405
386
# Finally, add options required by slave ports
406
# Finally, add options required by slave ports
387
PORT_OPTIONS+=	${OPTIONS_SLAVE}
407
PORT_OPTIONS+=	${OPTIONS_SLAVE}
388
408

Return to bug 191144