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

Collapse All | Expand All

(-)Mk/bsd.options.mk (+14 lines)
Lines 9-14 Link Here
9
# OPTIONS_DEFAULT_${ARCH}	- List of options activated by default for a
9
# OPTIONS_DEFAULT_${ARCH}	- List of options activated by default for a
10
#				  given arch
10
#				  given arch
11
#
11
#
12
# OPTIONS_GLOBAL_SET		- List of options that were overridden by make.conf
13
# OPTIONS_GLOBAL_UNSET		- List of options that were overridden by make.conf
12
# ${OPTION}_DESC		- Description of the ${OPTION}
14
# ${OPTION}_DESC		- Description of the ${OPTION}
13
#
15
#
14
# OPTIONS_SINGLE		- List of single-choice grouped options: 1 and
16
# OPTIONS_SINGLE		- List of single-choice grouped options: 1 and
Lines 228-233 Link Here
228
NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
230
NEW_OPTIONS:=	${NEW_OPTIONS:N${opt}}
229
.  endfor
231
.  endfor
230
232
233
## Sets of optins that were globally overridden
234
.  for opt in ${OPTIONS_UNSET}
235
.    if !empty(ALL_OPTIONS:M${opt})
236
OPTIONS_GLOBAL_UNSET+=	${opt}
237
.    endif
238
.  endfor
239
.  for opt in ${OPTIONS_SET}
240
.    if !empty(ALL_OPTIONS:M${opt})
241
OPTIONS_GLOBAL_SET+=	${opt}
242
.    endif
243
.  endfor
244
231
# XXX To remove once UNIQUENAME will be removed
245
# XXX To remove once UNIQUENAME will be removed
232
## Set the options specified per-port (set by user in make.conf)
246
## Set the options specified per-port (set by user in make.conf)
233
.  for opt in ${${UNIQUENAME}_SET}
247
.  for opt in ${${UNIQUENAME}_SET}
(-)Mk/bsd.port.mk (+3 lines)
Lines 5897-5902 Link Here
5897
pre-config:
5897
pre-config:
5898
D4P_ENV=	PKGNAME="${PKGNAME}" \
5898
D4P_ENV=	PKGNAME="${PKGNAME}" \
5899
		PORT_OPTIONS="${PORT_OPTIONS}" \
5899
		PORT_OPTIONS="${PORT_OPTIONS}" \
5900
		OPTIONS_DEFAULT="${OPTIONS_DEFAULT}" \
5901
		OPTIONS_GLOBAL_UNSET="${OPTIONS_GLOBAL_UNSET}" \
5902
		OPTIONS_GLOBAL_SET="${OPTIONS_GLOBAL_SET}" \
5900
		ALL_OPTIONS="${ALL_OPTIONS}" \
5903
		ALL_OPTIONS="${ALL_OPTIONS}" \
5901
		OPTIONS_MULTI="${OPTIONS_MULTI}" \
5904
		OPTIONS_MULTI="${OPTIONS_MULTI}" \
5902
		OPTIONS_SINGLE="${OPTIONS_SINGLE}" \
5905
		OPTIONS_SINGLE="${OPTIONS_SINGLE}" \

Return to bug 192540