Re: [PATCH] meson: Clean up some dependencies regarding qemu-system

[Paolo Bonzini]

On 12/16/22 20:07, Helge Deller wrote:
> @@ -3581,7 +3581,7 @@ subdir('qga')
>
>   # Don't build qemu-keymap if xkbcommon is not explicitly enabled
>   # when we don't build tools or system
> -if xkbcommon.found()
> +if xkbcommon.found() and have_system
>     # used for the update-keymaps target, so include rules even if !have_tools
>     qemu_keymap = executable('qemu-keymap', files('qemu-keymap.c', 
> 'ui/input-keymap.c') + genh,
>                              dependencies: [qemuutil, xkbcommon], install: 
> have_tools)
> @@ -3596,7 +3596,9 @@ if have_tools
>                  dependencies: [blockdev, qemuutil, gnutls, selinux],
>                  install: true)
>
> -  subdir('storage-daemon')
> +  if have_system
> +    subdir('storage-daemon')
> +  endif
>     subdir('contrib/rdmacm-mux')
>     subdir('contrib/elf2dmp')
>
> @@ -3611,7 +3613,7 @@ if have_tools
>       subdir('contrib/vhost-user-scsi')
>     endif
>
> -  if targetos == 'linux'
> +  if targetos == 'linux' and have_system
>       executable('qemu-bridge-helper', files('qemu-bridge-helper.c'),
>                  dependencies: [qemuutil, libcap_ng],
>                  install: true,
> diff --git a/tools/meson.build b/tools/meson.build
> index 10eb3a043f..740d572a94 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -5,7 +5,7 @@ have_virtiofsd = get_option('virtiofsd') \
>                error_message: 'virtiofsd requires libcap-ng-devel and 
> seccomp-devel') \
>       .require(have_vhost_user,
>                error_message: 'virtiofsd needs vhost-user-support') \
> -    .disable_auto_if(not have_tools and not have_system) \
> +    .disable_auto_if(not have_system) \
>       .allowed()
>
>   if have_virtiofsd

These are wrong.  qemu-bridge-helper, virtiofsd, qemu-storage-daemon and 
qemu-keymap *are* tools; if they fail to build due to any dependencies, 
or due to other compilation issues, you need to add tests to meson.build 
and check for the cause of the issues.

The rest is okay.

Paolo