diff options
| author | bapt <bapt@FreeBSD.org> | 2012-07-17 06:36:44 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2012-07-17 06:36:44 +0800 |
| commit | 6d4efec773a04cbb50c039a211f5e0faf6708ec0 (patch) | |
| tree | dc0af402f654cc162c50da818cce7df7b8fc7195 /Mk/bsd.options.mk | |
| parent | 3d6269415c80dbe8155ddd65c9450f6e0457bbaf (diff) | |
| download | freebsd-ports-gnome-6d4efec773a04cbb50c039a211f5e0faf6708ec0.tar.gz freebsd-ports-gnome-6d4efec773a04cbb50c039a211f5e0faf6708ec0.tar.zst freebsd-ports-gnome-6d4efec773a04cbb50c039a211f5e0faf6708ec0.zip | |
compare options loading from /var/db/port/options and make.conf against the
complete list of options.
COMPLETE_OPTIONS_LIST being OPTIONS_DEFINE + all the OPTIONS_SINGLE_* + all the
OPTIONS_MULTI_*
Diffstat (limited to 'Mk/bsd.options.mk')
| -rw-r--r-- | Mk/bsd.options.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 0980f27aeffc..2b30b012c0f0 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -117,6 +117,15 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${O}} ALL_OPTIONS:= ${ALL_OPTIONS:O:u} +# complete list +COMPLETE_OPTIONS_LIST= ${ALL_OPTIONS} +.for single in ${OPTIONS_SINGLE} +COMPLETE_OPTIONS_LIST+= ${OPTIONS_SINGLE_${single}} +.endfor +.for multi in ${OPTIONS_MULTI} +COMPLETE_OPTIONS_LIST+= ${OPTIONS_MULTI_${multi}} +.endfor + ## Now create the list of activated options .if defined(OPTIONS_OVERRIDE) # Special case $OPTIONS_OVERRIDE; if it is defined forget about anything done @@ -132,7 +141,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:O:u} ## Set system-wide defined options (set by user in make.conf) . for opt in ${OPTIONS_SET} -. if !empty(OPTIONS_DEFINE:M${opt}) +. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) PORT_OPTIONS+= ${opt} . endif . endfor @@ -145,7 +154,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} ## Set the options specified per-port (set by user in make.conf) . for opt in ${${UNIQUENAME}_SET} -. if !empty(OPTIONS_DEFINE:M${opt}) +. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) PORT_OPTIONS+= ${opt} . endif . endfor @@ -177,7 +186,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} ## Finish by using the options set by the port config dialog, if any . for opt in ${OPTIONS_FILE_SET} -. if !empty(OPTIONS_DEFINE:M${opt}) +. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) PORT_OPTIONS+= ${opt} . endif . endfor |