diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-07-22 18:32:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-07-22 18:32:02 +0100 |
| commit | 7b7ca8ebde4ee6fba171004b2726ae1ff5489c03 (patch) | |
| tree | f3327a0520948327ac540ad77792aee2df8a60d2 /meson.build | |
| parent | beb191385882a2a283ce777d76b1a77e71813d14 (diff) | |
| parent | 0848f8aca6f7b13f2a755c2593b0a1cbb39f658e (diff) | |
| download | qemu-7b7ca8ebde4ee6fba171004b2726ae1ff5489c03.zip qemu-7b7ca8ebde4ee6fba171004b2726ae1ff5489c03.tar.gz qemu-7b7ca8ebde4ee6fba171004b2726ae1ff5489c03.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
Bugfixes.
# gpg: Signature made Thu 22 Jul 2021 14:11:27 BST
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini-gitlab/tags/for-upstream:
configure: Let --without-default-features disable vhost-kernel and vhost-vdpa
configure: Fix the default setting of the "xen" feature
configure: Allow vnc to get disabled with --without-default-features
configure: Fix --without-default-features propagation to meson
meson: fix dependencies for modinfo
configure: Drop obsolete check for the alloc_size attribute
target/i386: Added consistency checks for EFER
target/i386: Added consistency checks for CR4
target/i386: Added V_INTR_PRIO check to virtual interrupts
qemu-config: restore "machine" in qmp_query_command_line_options()
usb: fix usb-host dependency check
chardev-spice: add missing module_obj directive
vl: Parse legacy default_machine_opts
qemu-config: fix memory leak on ferror()
qemu-config: never call the callback after an error, fix leak
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 2f37709..df5094e 100644 --- a/meson.build +++ b/meson.build @@ -930,7 +930,7 @@ vnc = not_found png = not_found jpeg = not_found sasl = not_found -if get_option('vnc').enabled() +if not get_option('vnc').disabled() vnc = declare_dependency() # dummy dependency png = dependency('libpng', required: get_option('vnc_png'), method: 'pkg-config', kwargs: static_kwargs) @@ -2335,9 +2335,9 @@ foreach d, list : modules # https://github.com/mesonbuild/meson/pull/8900 modinfo_files += custom_target(d + '-' + m + '.modinfo', output: d + '-' + m + '.modinfo', - input: module_ss.sources(), + input: module_ss.sources() + genh, capture: true, - command: [modinfo_collect, '@INPUT@']) + command: [modinfo_collect, module_ss.sources()]) endif else if d == 'block' |