Re: [PATCH 000/147] Meson integration for 5.2

[Paolo Bonzini]

On 10/08/20 20:09, Peter Maydell wrote:
> ModuleNotFoundError: No module named 'pkg_resources'
> 
> ERROR: meson setup failed

Missing dependency, you have to install python3-setuptools.  But it will 
fail just as aarch64 due to the same incorrect line.

> make: *** Deleting file 'config-host.mak'
> make: *** No rule to make target 'config-host.mak', needed by
> 'meson-private/coredata.dat'.  Stop.
> make: Leaving directory '/home/peter.maydell/qemu/build/all-a32'
> 
> 
> Build failure, aarch64:
> 
> Program scripts/grepy.sh found: YES
> Configuring config-all-devices.mak with command
> Program scripts/hxtool found: YES
> Program scripts/shaderinclude.pl found: YES
> Program scripts/qapi-gen.py found: YES
> Program scripts/tracetool.py found: YES
> Program scripts/qemu-version.sh found: YES
> Program keycodemapdb/tools/keymap-gen found: YES
> Program scripts/decodetree.py found: YES
> Program ../scripts/modules/module_block.py found: YES
> Program nm found: YES
> Program scripts/undefsym.sh found: YES
> Program scripts/feature_to_c.sh found: YES
> Program scripts/tracetool.py found: YES
> 
> ../../meson.build:969:2: ERROR: File kvm64.c does not exist.
> 
> A full log can be found at /home/pm/qemu/build/all/meson-logs/meson-log.txt

My bug, fixed thusly:

diff --git a/target/arm/meson.build b/target/arm/meson.build
index 056223a..bd46cdb 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -34,7 +34,7 @@ arm_ss.add(zlib)
 arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c'))
 
 kvm_ss = ss.source_set()
-kvm_ss.add(when: 'TARGET_AARCH64', if_true: 'kvm64.c', if_false: 'kvm32.c')
+kvm_ss.add(when: 'TARGET_AARCH64', if_true: files('kvm64.c'), if_false: 
files('kvm32.c'))
 arm_ss.add_all(when: 'CONFIG_KVM', if_true: kvm_ss)
 arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c'), if_false: 
files('kvm-stub.c'))
 

Paolo