diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-11-13 13:50:35 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-11-13 13:50:35 +0000 |
| commit | 6684338e9192ab6675e7b19d62aea3d3a5c641fe (patch) | |
| tree | 97b0beb076b0e4472c4c8a94ddebfd7398889b4d /Mk/bsd.options.mk | |
| parent | 3e6ac56dcf788f25dee7bcfb424853427f41f4ac (diff) | |
| download | ports-6684338e9192ab6675e7b19d62aea3d3a5c641fe.tar.gz ports-6684338e9192ab6675e7b19d62aea3d3a5c641fe.zip | |
Refactor the list of all excluded options so that the second place it is
needed is not forgotten any more.
PR: 204510
With hat: portmgr
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=401514
Diffstat (limited to 'Mk/bsd.options.mk')
| -rw-r--r-- | Mk/bsd.options.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 401c87de1d28..f399660412af 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -205,9 +205,11 @@ OPTIONS_DEFINE+= ${opt} # Add per arch defaults OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${ARCH}} +_ALL_EXCLUDE= ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} \ + ${OPTIONS_SLAVE} ${OPTIONS_EXCLUDE_${OPSYS}} + # Remove options the port maintainer doesn't want -.for opt in ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} ${OPTIONS_SLAVE} \ - ${OPTIONS_EXCLUDE_${OPSYS}} +.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}} @@ -451,7 +453,7 @@ ALL_OPTIONS= ${OPTIONS_DEFINE} _OPTIONS_${target}?= .endfor -.for opt in ${COMPLETE_OPTIONS_LIST} ${OPTIONS_SLAVE} ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} +.for opt in ${COMPLETE_OPTIONS_LIST} ${_ALL_EXCLUDE:O:u} # PLIST_SUB PLIST_SUB?= SUB_LIST?= |