From 6c614947714460f5517b1fa9e602368eaecbaecb Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sun, 24 Oct 2021 20:05:40 -0400 Subject: [PATCH] freedreno: support lua54 This is the default version in gentoo, and it apparently uses the lua54 variant rather than lua. Signed-off-by: Ilia Mirkin Reviewed-by: Emma Anholt Acked-by: Rob Clark Part-of: --- src/freedreno/meson.build | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build index 8d1f12b63cf..f24221e7355 100644 --- a/src/freedreno/meson.build +++ b/src/freedreno/meson.build @@ -25,13 +25,13 @@ rnn_src_path = meson.source_root() + '/src/freedreno/registers' rnn_install_path = get_option('datadir') + '/freedreno/registers' rnn_path = rnn_src_path + ':' + get_option('prefix') + '/' + rnn_install_path -dep_lua = dependency('lua53', required: false) -if not dep_lua.found() - dep_lua = dependency('lua52', required: false) -endif -if not dep_lua.found() - dep_lua = dependency('lua', required: false, version : '>=5.2') -endif +# TODO: use multi-argument dependency() in meson 0.60 +foreach lua : ['lua54', 'lua53', 'lua52', 'lua'] + dep_lua = dependency(lua, required: false, version: '>=5.2') + if dep_lua.found() + break + endif +endforeach dep_libarchive = dependency('libarchive', required: false) dep_libxml2 = dependency('libxml-2.0', required: false)