aboutsummaryrefslogtreecommitdiff
path: root/contrib/vhost-user-gpu
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2020-08-26 08:22:58 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2020-08-27 18:52:30 +0200
commitb7612f45da9ea3ff3488a34f2ffd39d0d94713fb (patch)
tree6f26a9ca4db19e6342bc62553f1ab33561479b90 /contrib/vhost-user-gpu
parentfb648e9cacf4209ddaa8ee67d1a87a9b78a001c6 (diff)
downloadqemu-b7612f45da9ea3ff3488a34f2ffd39d0d94713fb.zip
qemu-b7612f45da9ea3ff3488a34f2ffd39d0d94713fb.tar.gz
qemu-b7612f45da9ea3ff3488a34f2ffd39d0d94713fb.tar.bz2
meson: move pixman detection to meson
When pixman is not installed (or too old), but virglrenderer is available and "configure" has been run with "--disable-system", the build currently aborts when trying to compile vhost-user-gpu (since it requires pixman). Let's skip the build of vhost-user-gpu when pixman is not installed or too old. Instead of adding CONFIG_PIXMAN, it is simpler to move the detection to pixman. Based on a patch by Thomas Huth. <thuth@redhat.com> Fixes: 9b52b17ba5 ("configure: Allow to build tools without pixman") Reported-by: Rafael Kitover <rkitover@gmail.com> Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'contrib/vhost-user-gpu')
-rw-r--r--contrib/vhost-user-gpu/meson.build3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build
index 6c1459f..12d608c 100644
--- a/contrib/vhost-user-gpu/meson.build
+++ b/contrib/vhost-user-gpu/meson.build
@@ -1,5 +1,6 @@
if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in config_host \
- and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host
+ 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'),
link_with: libvhost_user,
dependencies: [qemuutil, pixman, gbm, virgl],