[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/48] meson: fix missing preprocessor symbols
From: |
Paolo Bonzini |
Subject: |
[PULL 03/48] meson: fix missing preprocessor symbols |
Date: |
Thu, 8 Jul 2021 17:17:03 +0200 |
While most libraries do not need a CONFIG_* symbol because the
"when:" clauses are enough, some do. Add them back or stop
using them if possible.
In the case of libpmem, the statement to add the CONFIG_* symbol
was still in configure, but could not be triggered because it
checked for "no" instead of "disabled" (and it would be wrong anyway
since the test for the library has not been done yet).
Reported-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Fixes: 587d59d6cc ("configure, meson: convert virgl detection to meson",
2021-07-06)
Fixes: 83ef16821a ("configure, meson: convert libdaxctl detection to meson",
2021-07-06)
Fixes: e36e8c70f6 ("configure, meson: convert libpmem detection to meson",
2021-07-06)
Fixes: 53c22b68e3 ("configure, meson: convert liburing detection to meson",
2021-07-06)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 6 ------
contrib/vhost-user-gpu/meson.build | 2 +-
meson.build | 4 ++++
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index a172c83e15..a04b1e075c 100755
--- a/configure
+++ b/configure
@@ -4818,12 +4818,6 @@ elif test "$pthread_setname_np_wo_tid" = "yes" ; then
echo "CONFIG_PTHREAD_SETNAME_NP_WO_TID=y" >> $config_host_mak
fi
-if test "$libpmem" = "yes" ; then
- echo "CONFIG_LIBPMEM=y" >> $config_host_mak
- echo "LIBPMEM_LIBS=$libpmem_libs" >> $config_host_mak
- echo "LIBPMEM_CFLAGS=$libpmem_cflags" >> $config_host_mak
-fi
-
if test "$bochs" = "yes" ; then
echo "CONFIG_BOCHS=y" >> $config_host_mak
fi
diff --git a/contrib/vhost-user-gpu/meson.build
b/contrib/vhost-user-gpu/meson.build
index 0ce1515a10..4cb52a91d7 100644
--- a/contrib/vhost-user-gpu/meson.build
+++ b/contrib/vhost-user-gpu/meson.build
@@ -1,4 +1,4 @@
-if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in config_host \
+if 'CONFIG_TOOLS' in config_host and virgl.found() \
and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host \
and pixman.found()
executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm.c'),
diff --git a/meson.build b/meson.build
index 7e12de01be..9cd966a86b 100644
--- a/meson.build
+++ b/meson.build
@@ -1223,8 +1223,11 @@ config_host_data.set('CONFIG_VTE', vte.found())
config_host_data.set('CONFIG_LIBATTR', have_old_libattr)
config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found())
config_host_data.set('CONFIG_EBPF', libbpf.found())
+config_host_data.set('CONFIG_LIBDAXCTL', libdaxctl.found())
config_host_data.set('CONFIG_LIBISCSI', libiscsi.found())
config_host_data.set('CONFIG_LIBNFS', libnfs.found())
+config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
+config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
config_host_data.set('CONFIG_RBD', rbd.found())
config_host_data.set('CONFIG_SDL', sdl.found())
config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
@@ -1237,6 +1240,7 @@ config_host_data.set('CONFIG_VNC_JPEG', jpeg.found())
config_host_data.set('CONFIG_VNC_PNG', png.found())
config_host_data.set('CONFIG_VNC_SASL', sasl.found())
config_host_data.set('CONFIG_VIRTFS', have_virtfs)
+config_host_data.set('CONFIG_VTE', vte.found())
config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found())
config_host_data.set('CONFIG_KEYUTILS', keyutils.found())
config_host_data.set('CONFIG_GETTID', has_gettid)
--
2.31.1
- [PULL 00/48] Misc patches for QEMU 6.1 soft freeze, Paolo Bonzini, 2021/07/08
- [PULL 01/48] configure: fix libdaxctl options, Paolo Bonzini, 2021/07/08
- [PULL 03/48] meson: fix missing preprocessor symbols,
Paolo Bonzini <=
- [PULL 06/48] modules: collect module meta-data, Paolo Bonzini, 2021/07/08
- [PULL 02/48] configure: fix libpmem configuration option, Paolo Bonzini, 2021/07/08
- [PULL 04/48] osdep: fix HAVE_BROKEN_SIZE_MAX case, Paolo Bonzini, 2021/07/08
- [PULL 05/48] modules: add modinfo macros, Paolo Bonzini, 2021/07/08
- [PULL 10/48] modules: add virtio-gpu module annotations, Paolo Bonzini, 2021/07/08
- [PULL 12/48] modules: add audio module annotations, Paolo Bonzini, 2021/07/08
- [PULL 07/48] modules: generate modinfo.c, Paolo Bonzini, 2021/07/08
- [PULL 09/48] modules: add qxl module annotations, Paolo Bonzini, 2021/07/08
- [PULL 13/48] modules: add usb-redir module annotations, Paolo Bonzini, 2021/07/08
- [PULL 14/48] modules: add ccid module annotations, Paolo Bonzini, 2021/07/08