meson: Do not try to build module for empty per-target hw/ directory
PATCH 1/1 meson: Do not try to build module for empty per-target hw/ directory
In commit 83d5db95d38 ("meson: Allow system binaries to not have target-specific units") we allowed targets with empty target_system_arch[] source set, but missed hw_arch[] could also be empty when building modules.
Skip such case, otherwise due to commit a1ced487549 ("hw/microblaze: Build files once"), building with --enable-modules triggers:
../meson.build:4034:14: ERROR: Key microblaze is not in the dictionary.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3272
--- meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meson.build +5 -2
@@ -4029,6 +4029,11 @@ if enable_modules foreach target : target_dirs if target.endswith('-softmmu') config_target = config_target_mak[target] + arch = config_target['TARGET_NAME'] == 'sparc64' ? 'sparc64' : config_target['TARGET_BASE_ARCH'] + if not hw_arch.has_key(arch) + continue + endif + config_devices_mak = target + '-config-devices.mak' modinfo_src = custom_target('modinfo-' + target + '.c', output: 'modinfo-' + target + '.c',
@@ -4038,8 +4043,6 @@ if enable_modules modinfo_lib = static_library('modinfo-' + target + '.c', modinfo_src) modinfo_dep = declare_dependency(link_with: modinfo_lib) - - arch = config_target['TARGET_NAME'] == 'sparc64' ? 'sparc64' : config_target['TARGET_BASE_ARCH'] hw_arch[arch].add(modinfo_dep) endif endforeach
Signature · 1 line
2.52.0
Quoted 11 lines · Philippe Mathieu-Daudé
In commit
83d5db95d38("meson: Allow system binaries to not have target-specific units") we allowed targets with empty target_system_arch[] source set, but missed hw_arch[] could also be empty when building modules.Skip such case, otherwise due to commit
a1ced487549("hw/microblaze: Build files once"), building with --enable-modules triggers:../meson.build:4034:14: ERROR: Key microblaze is not in the dictionary.
Quoted 8 lines
Fixes a1ced487549 ("hw/microblaze: Build files once")Reported-by Frederic Bezies <[email protected]>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3272
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Quoted 11 lines · Philippe Mathieu-Daudé
In commit
83d5db95d38("meson: Allow system binaries to not have target-specific units") we allowed targets with empty target_system_arch[] source set, but missed hw_arch[] could also be empty when building modules.Skip such case, otherwise due to commit
a1ced487549("hw/microblaze: Build files once"), building with --enable-modules triggers:../meson.build:4034:14: ERROR: Key microblaze is not in the dictionary.
Quoted 7 lines
Fixes a1ced487549 ("hw/microblaze: Build files once")Reported-by Frederic Bezies <[email protected]>Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3272
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
Queued.