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

[Paolo Bonzini]

On 07/08/20 11:45, Thomas Huth wrote:
> On 07/08/2020 11.31, Paolo Bonzini wrote:
>> On 07/08/20 10:51, Thomas Huth wrote:
>>> 2) With --meson=git added, I also do not get much further:
>>>  "./ui/meson.build:77:0: ERROR: Program 'keycodemapdb/tools/keymap-gen'
>>> not found"
>>>
>>>  https://gitlab.com/huth/qemu/-/jobs/675546229
>>>
>>> Any idea what's going wrong here?
>>
>> This is also a submodule not being initialized,
>> ui/keycodemapdb/tools/keymap-gen comes from a submodule.
> 
> Ok. I've added a hack to my configure script to checkout the submodules,
> but still, it does not compile yet:
> 
>  ../tools/virtiofsd/meson.build:1:0: ERROR: Unknown variable
> "libvhost_user".
>  https://gitlab.com/huth/qemu/-/jobs/675665455

Fixed, thanks:

diff --git a/meson.build b/meson.build
index 38f1f40..cc96d07 100644
--- a/meson.build
+++ b/meson.build
@@ -1091,9 +1091,10 @@ if have_tools
     subdir('contrib/ivshmem-client')
     subdir('contrib/ivshmem-server')
   endif
+
+  subdir('tools')
 endif

-subdir('tools')
 subdir('scripts')
 subdir('pc-bios')
 subdir('tests')

(This is an example of Meson doing a much stronger check on the validity
of the build).

Paolo