diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-08-22 21:59:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-08-22 21:59:08 +0100 |
| commit | 3a52b42c949ddd6ebb9f7e86ad83243bd1d52d9e (patch) | |
| tree | 5ee65e2d4d57dd6abfa1e99f6b4cabeff32bea80 /util | |
| parent | 66e01f1cdc9663660201cced4df8ec0a28937919 (diff) | |
| parent | 460b4664c6ad2b88ccfb2d69ab4cbb7d6c9165a0 (diff) | |
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
meson fixes:
* --disable-tools --enable-system build
* s390 no-TCG build
* fdmon-io_uring
* 'shift' error message in version_ge()
# gpg: Signature made Fri 21 Aug 2020 22:12:29 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:
keymaps: update
meson: Fix --disable-tools --enable-system builds
meson: convert pc-bios/keymaps/Makefile
configure: silence 'shift' error message in version_ge()
util/meson.build: fix fdmon-io_uring build
target/s390x: fix meson.build issue
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/meson.build b/util/meson.build index 23b8ad459b..e6b207a99e 100644 --- a/util/meson.build +++ b/util/meson.build @@ -4,7 +4,7 @@ util_ss.add(when: 'CONFIG_ATOMIC64', if_false: files('atomic64.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('fdmon-poll.c')) util_ss.add(when: 'CONFIG_EPOLL_CREATE1', if_true: files('fdmon-epoll.c')) -util_ss.add(when: 'CONFIG_LINUX_IO_URING', if_true: files('fdmon-io_uring.c')) +util_ss.add(when: ['CONFIG_LINUX_IO_URING', linux_io_uring], if_true: files('fdmon-io_uring.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('compatfd.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('event_notifier-posix.c')) util_ss.add(when: 'CONFIG_POSIX', if_true: files('mmap-alloc.c')) |