Re: [DRAFT PATCH 000/143] Meson integration for 5.2

[Paolo Bonzini]

On 07/08/20 11:52, Thomas Huth wrote:
>> At least the Debian container started to compile, but then fails here:
>>
>>  ../hw/display/virtio-gpu.c:43:10: fatal error: virglrenderer.h: No such
>> file or directory
>>  https://gitlab.com/huth/qemu/-/jobs/675665451

Likely just a rebase issue:

diff --git a/hw/display/meson.build b/hw/display/meson.build
index efe18f2..ffcccc0 100644
--- a/hw/display/meson.build
+++ b/hw/display/meson.build
@@ -81,13 +81,6 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU')
                      if_true: virtio_gpu_ss)
 endif
 
-specific_ss.add(when: [pixman, 'CONFIG_VIRTIO_GPU'], if_true: 
[files('virtio-gpu-base.c', 'virtio-gpu.c', 'virtio-gpu-3d.c'), virgl])
-specific_ss.add(when: [pixman, 'CONFIG_VHOST_USER_GPU'], if_true: 
files('vhost-user-gpu.c'))
-specific_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRTIO_PCI'], if_true: 
files('virtio-gpu-pci.c'))
-specific_ss.add(when: ['CONFIG_VHOST_USER_GPU', 'CONFIG_VIRTIO_PCI'], if_true: 
files('vhost-user-gpu-pci.c'))
-specific_ss.add(when: 'CONFIG_VIRTIO_VGA', if_true: files('virtio-vga.c'))
-specific_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: 
files('vhost-user-vga.c'))
-
 specific_ss.add(when: [x11, opengl, 'CONFIG_MILKYMIST_TMU2'], if_true: 
files('milkymist-tmu2.c'))
 specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c'))
 


> And yet another error, this time on Travis with --disable-system :
> 
>  ../hw/display/meson.build:42:22: ERROR: Unknown variable
> "config_all_devices".
>  https://travis-ci.com/github/huth/qemu/jobs/369657010#L1035

diff --git a/meson.build b/meson.build
index 5635f8e..ddd73d4 100644
--- a/meson.build
+++ b/meson.build
@@ -491,10 +491,10 @@ if have_system
     command: [grepy, '@INPUT@'],
   )
   config_all_devices = keyval.load(config_all_devices_mak)
-  config_all = config_all_devices
 else
-  config_all = {}
+  config_all_devices = {}
 endif
+config_all = config_all_devices
 config_all += config_host
 config_all += config_all_disas
 config_all += {


More type checking.  I'll finish my current round of testing and push again.

Paolo