From: Paolo Bonzini Date: Thu, 4 May 2023 08:20:46 +0000 (+0200) Subject: meson: leave unnecessary modules out of the build X-Git-Tag: v8.0.1~54 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8322e5300fb5fa7fbbe27b1882263159f24c5ae9;p=thirdparty%2Fqemu.git meson: leave unnecessary modules out of the build meson.build files choose whether to build modules based on foo.found() expressions. If a feature is enabled (e.g. --enable-gtk), these expressions are true even if the code is not used by any emulator, and this results in an unexpected difference between modular and non-modular builds. For non-modular builds, the files are not included in any binary, and therefore the source files are never processed. For modular builds, however, all .so files are unconditionally built by default, and therefore a normal "make" tries to build them. However, the corresponding trace-*.h files are absent due to this conditional: if have_system trace_events_subdirs += [ ... 'ui', ... ] endif which was added to avoid wasting time running tracetool on unused trace-events files. This causes a compilation failure; fix it by skipping module builds entirely if (depending on the module directory) have_block or have_system are false. Reported-by: Michael Tokarev Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini (cherry picked from commit ef709860ea12ec59c4cd7373bd2fd7a4e50143ee) Signed-off-by: Michael Tokarev --- diff --git a/meson.build b/meson.build index c44d05a13f9..c7e486e0879 100644 --- a/meson.build +++ b/meson.build @@ -3213,6 +3213,10 @@ modinfo_files = [] block_mods = [] softmmu_mods = [] foreach d, list : modules + if not (d == 'block' ? have_block : have_system) + continue + endif + foreach m, module_ss : list if enable_modules and targetos != 'windows' module_ss = module_ss.apply(config_all, strict: false)