commit 3a213f83d99687e6648702421675a922ea71d593
author Stefan Hajnoczi <stefanha@redhat.com> Thu Sep 24 16:15:49 2020 +0100
committer Stefan Hajnoczi <stefanha@redhat.com> Fri Oct 23 13:42:16 2020 +0100
tree c48ebd402076d7389a2b71eb62e2c0e71b64630f
parent 80a06cc52bcf7a9771407306991a816834c04941

util/vhost-user-server: use static library in meson.build

Don't compile contrib/libvhost-user/libvhost-user.c again. Instead build
the static library once and then reuse it throughout QEMU.

Also switch from CONFIG_LINUX to CONFIG_VHOST_USER, which is what the
vhost-user tools (vhost-user-gpu, etc) do.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200924151549.913737-14-stefanha@redhat.com
[Added CONFIG_LINUX again because libvhost-user doesn't build on macOS.
--Stefan]
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

meson.build

diff --git a/meson.build b/meson.build
index 7627a0a..2ec4f11 100644
--- a/meson.build
+++ b/meson.build
@@ -1398,6 +1398,11 @@
   'util',
 ]
 
+vhost_user = not_found
+if 'CONFIG_VHOST_USER' in config_host
+  subdir('contrib/libvhost-user')
+endif
+
 subdir('qapi')
 subdir('qobject')
 subdir('stubs')
@@ -1830,7 +1835,6 @@
              install: true)
 
   if 'CONFIG_VHOST_USER' in config_host
-    subdir('contrib/libvhost-user')
     subdir('contrib/vhost-user-blk')
     subdir('contrib/vhost-user-gpu')
     subdir('contrib/vhost-user-input')