[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/18] meson: reenable filemonitor-inotify compilation
From: |
Paolo Bonzini |
Subject: |
[PULL 18/18] meson: reenable filemonitor-inotify compilation |
Date: |
Mon, 10 Jan 2022 15:40:34 +0100 |
From: Volker RĂ¼melin <vr_qemu@t-online.de>
Reenable util/filemonitor-inotify compilation. Compilation was
disabled when commit a620fbe9ac ("configure: convert compiler tests
to meson, part 5") moved CONFIG_INOTIFY1 from config-host.mak to
config-host.h.
This fixes the usb-mtp device and reenables test-util-filemonitor.
Fixes: a620fbe9ac ("configure: convert compiler tests to meson, part 5")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/800
Signed-off-by: Volker RĂ¼melin <vr_qemu@t-online.de>
Message-Id: <20220107133514.7785-1-vr_qemu@t-online.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/unit/meson.build | 2 +-
util/meson.build | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 90acf5b0da..64a5e7bfde 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -129,7 +129,7 @@ if have_system
'test-vmstate': [migration, io],
'test-yank': ['socket-helpers.c', qom, io, chardev]
}
- if 'CONFIG_INOTIFY1' in config_host
+ if config_host_data.get('CONFIG_INOTIFY1')
tests += {'test-util-filemonitor': []}
endif
diff --git a/util/meson.build b/util/meson.build
index e676b2f6c6..c9a9cc1cf5 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -84,7 +84,10 @@ if have_block
util_ss.add(files('readline.c'))
util_ss.add(files('throttle.c'))
util_ss.add(files('timed-average.c'))
- util_ss.add(when: 'CONFIG_INOTIFY1', if_true: files('filemonitor-inotify.c'),
- if_false: files('filemonitor-stub.c'))
+ if config_host_data.get('CONFIG_INOTIFY1')
+ util_ss.add(files('filemonitor-inotify.c'))
+ else
+ util_ss.add(files('filemonitor-stub.c'))
+ endif
util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c'))
endif
--
2.33.1
- [PULL 09/18] configure: move non-command-line variables away from command-line parsing section, (continued)
- [PULL 09/18] configure: move non-command-line variables away from command-line parsing section, Paolo Bonzini, 2022/01/10
- [PULL 08/18] configure: parse --enable/--disable-strip automatically, flip default, Paolo Bonzini, 2022/01/10
- [PULL 10/18] meson: build contrib/ executables after generated headers, Paolo Bonzini, 2022/01/10
- [PULL 11/18] configure, meson: move config-poison.h to meson, Paolo Bonzini, 2022/01/10
- [PULL 12/18] meson: add comments in the target-specific flags section, Paolo Bonzini, 2022/01/10
- [PULL 13/18] KVM: use KVM_{GET|SET}_SREGS2 when supported., Paolo Bonzini, 2022/01/10
- [PULL 14/18] KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS, Paolo Bonzini, 2022/01/10
- [PULL 15/18] tests/tcg: Fix target-specific Makefile variables path for user-mode, Paolo Bonzini, 2022/01/10
- [PULL 16/18] configure: do not create roms/seabios/config.mak if SeaBIOS not present, Paolo Bonzini, 2022/01/10
- [PULL 17/18] meson: build all modules by default, Paolo Bonzini, 2022/01/10
- [PULL 18/18] meson: reenable filemonitor-inotify compilation,
Paolo Bonzini <=
- Re: [PULL v4 00/18] Build system and KVM changes for 2021-12-23, Peter Maydell, 2022/01/11