From 1737638c98d534b2aa7eda69298efadb81aec8c7 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Fri, 21 Nov 2025 09:03:29 -0800 Subject: [PATCH] meson: make dep_lua a disabler There are cases where the freedreno `crashdec` program will not be built, but will still be used. By making dep_lua a disabler, we move closer to being able to have those tests automatically disabled when crashdec isn't built. Acked-by: Rob Clark Acked-by: Emma Anholt Part-of: --- meson.build | 1 + src/freedreno/decode/meson.build | 2 +- src/intel/executor/meson.build | 5 +---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 211d63e93b6..d33becbb120 100644 --- a/meson.build +++ b/meson.build @@ -1918,6 +1918,7 @@ dep_lua = dependency('lua54', 'lua5.4', 'lua-5.4', 'lua53', 'lua5.3', 'lua-5.3', 'lua', required: false, allow_fallback: with_tools.contains('freedreno'), + disabler : true, version: '>=5.3') # Be explicit about only using this lib on Windows, to avoid picking diff --git a/src/freedreno/decode/meson.build b/src/freedreno/decode/meson.build index b672d43caae..7b7c43327ef 100644 --- a/src/freedreno/decode/meson.build +++ b/src/freedreno/decode/meson.build @@ -162,7 +162,7 @@ else warning('libarchive not found, not building replay or rddecompiler') endif -if dep_lua.found() and dep_libarchive.found() +if dep_libarchive.found() cffdump = executable( 'cffdump', [ diff --git a/src/intel/executor/meson.build b/src/intel/executor/meson.build index 22859b1cdda..b2495309f7f 100644 --- a/src/intel/executor/meson.build +++ b/src/intel/executor/meson.build @@ -1,10 +1,6 @@ # Copyright © 2024 Intel Corporation # SPDX-License-Identifier: MIT -if not dep_lua.found() - subdir_done() -endif - executor_flags = [ no_override_init_args, sse2_args, @@ -32,6 +28,7 @@ foreach v: ['90', '110', '120', '125', '200', '300'] idep_genxml, idep_intel_dev, ], + build_by_default : false, ) endforeach