meson: fix power8 option

Do not throw a deprecation warning if the power8 option is set to the
new 'disabled' value. Instead, warn if it is still set to the legacy
value 'false'.

Fixes: 138c003d22 ("meson: deprecated 'true' and 'false' in combo options for 'enabled' and 'disabled'")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6370>
(cherry picked from commit 03bea54e02)
This commit is contained in:
Philipp Zabel 2020-08-18 15:28:41 +02:00 committed by Dylan Baker
parent aedd29141a
commit 1784d889f2
2 changed files with 2 additions and 2 deletions

View file

@ -652,7 +652,7 @@
"description": "meson: fix power8 option",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "138c003d22739b0d1e6860ed398dd511a44cde04"
},

View file

@ -752,7 +752,7 @@ _power8 = get_option('power8')
if _power8 == 'true'
_power8 = 'enabled'
warning('power8 option "true" deprecated, please use "enabled" instead.')
elif _power8 == 'disabled'
elif _power8 == 'false'
_power8 = 'disabled'
warning('power8 option "false" deprecated, please use "disabled" instead.')
endif