[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-5.2 v4 02/17] meson: always include contrib/libvhost-user
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-5.2 v4 02/17] meson: always include contrib/libvhost-user |
Date: |
Sun, 8 Nov 2020 21:45:20 +0100 |
From: Stefan Hajnoczi <stefanha@redhat.com>
libvhost-user is needed when CONFIG_LINUX is set. The CONFIG_VHOST_USER
check in meson.build is incorrect.
In fact, no explicit check is needed since this dependency is not built
by default. If something declares a dependency on libvhost-user then it
will be built, otherwise it won't be built (i.e. on non-Linux hosts).
This fixes ./configure --disable-vhost-user && make.
Fixes: bc15e44cb2191bbb2318878acdf5038134e56394 ("configure: introduce
--enable-vhost-user-blk-server")
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reported-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201106210340.698771-1-stefanha@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
meson.build | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/meson.build b/meson.build
index f5175010dfa..b4736203219 100644
--- a/meson.build
+++ b/meson.build
@@ -1450,11 +1450,7 @@
'util',
]
-vhost_user = not_found
-if 'CONFIG_VHOST_USER' in config_host
- subdir('contrib/libvhost-user')
-endif
-
+subdir('contrib/libvhost-user')
subdir('qapi')
subdir('qobject')
subdir('stubs')
--
2.26.2
- [PATCH-for-5.2 v4 00/17] ci: Move various jobs from Travis to GitLab CI, Philippe Mathieu-Daudé, 2020/11/08
- [PATCH-for-5.2 v4 01/17] configure: Check vhost-user is available to build vhost-user-blk-server, Philippe Mathieu-Daudé, 2020/11/08
- [PATCH-for-5.2 v4 02/17] meson: always include contrib/libvhost-user,
Philippe Mathieu-Daudé <=
- [PATCH-for-5.2 v4 03/17] hw/i386/acpi-build: Fix maybe-uninitialized error when ACPI hotplug off, Philippe Mathieu-Daudé, 2020/11/08
- [PATCH-for-6.0 v4 04/17] MAINTAINERS: Add gitlab-pipeline-status script to GitLab CI section, Philippe Mathieu-Daudé, 2020/11/08
- [PATCH-for-6.0 v4 05/17] gitlab-ci: Split CONFIGURE_ARGS one argument per line for build-disabled, Philippe Mathieu-Daudé, 2020/11/08
- [PATCH-for-6.0 v4 06/17] gitlab-ci: Update 'build-disabled' to cover all configurable options, Philippe Mathieu-Daudé, 2020/11/08
- [PATCH-for-6.0 v4 07/17] gitlab-ci: Move job testing --without-default-devices across to gitlab, Philippe Mathieu-Daudé, 2020/11/08