diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-26 08:22:58 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-27 18:52:30 +0200 |
| commit | b7612f45da9ea3ff3488a34f2ffd39d0d94713fb (patch) | |
| tree | 6f26a9ca4db19e6342bc62553f1ab33561479b90 /ui | |
| parent | fb648e9cacf4209ddaa8ee67d1a87a9b78a001c6 (diff) | |
| download | qemu-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 'ui')
| -rw-r--r-- | ui/meson.build | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/meson.build b/ui/meson.build index 018c569..393c9bc 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -1,3 +1,6 @@ +softmmu_ss.add(pixman) +specific_ss.add(pixman) # for the include path + softmmu_ss.add(files( 'console.c', 'cursor.c', @@ -9,7 +12,6 @@ softmmu_ss.add(files( 'keymaps.c', 'qemu-pixman.c', )) -softmmu_ss.add(pixman) softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c')) softmmu_ss.add(when: 'CONFIG_SPICE', if_true: files('spice-core.c', 'spice-input.c', 'spice-display.c')) |