mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
Code Issues Releases Activity

Do not enable options that do not exist.

Browse Source 
Differential Revision:	https://reviews.freebsd.org/D13953
This commit is contained in:
Mathieu Arnold 2018-09-10 14:40:57 +00:00
parent 2cd8808f7d
commit f4c9be1393
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=479428
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Mk/bsd.options.mk
View File

@ -197,8 +197,6 @@ _OPTIONS_TARGETS= fetch:300:pre fetch:500:do fetch:700:post \
package:300:pre package:500:do package:700:post \
stage:800:post
PORT_OPTIONS+= DOCS NLS EXAMPLES IPV6
# Add per arch options
.for opt in ${OPTIONS_DEFINE_${ARCH}}
.if empty(OPTIONS_DEFINE:M${opt})
@ -223,11 +221,10 @@ _ALL_EXCLUDE+= ${opt}
. endif
.endfor
# Remove options the port maintainer doesn't want
# Remove options the port maintainer doesn't want, part 1
.for opt in ${_ALL_EXCLUDE:O:u}
OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:N${opt}}
OPTIONS_DEFINE:= ${OPTIONS_DEFINE:N${opt}}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
. for otype in SINGLE RADIO MULTI GROUP
. for m in ${OPTIONS_${otype}}
OPTIONS_${otype}_${m}:= ${OPTIONS_${otype}_${m}:N${opt}}
@ -257,6 +254,18 @@ COMPLETE_OPTIONS_LIST+= ${OPTIONS_${otype}_${m}}
. endfor
.endfor
# Some options are always enabled by default.
.for _opt in DOCS NLS EXAMPLES IPV6
.if ${COMPLETE_OPTIONS_LIST:M${_opt}}
PORT_OPTIONS+= ${_opt}
.endif
.endfor
# Remove options the port maintainer doesn't want, part 2
.for opt in ${_ALL_EXCLUDE:O:u}
PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
.endfor
## Now create the list of activated options
.if defined(OPTIONS_OVERRIDE)
# Special case $OPTIONS_OVERRIDE; if it is defined forget about anything done