Re: [PATCH] meson: Fix --disable-tools --enable-system builds

[Paolo Bonzini]

On 21/08/20 17:05, Philippe Mathieu-Daudé wrote:
> Fixes:
> 
>  $ ../configure --disable-tools --disable-user
>  ../tests/qemu-iotests/meson.build:7:0: ERROR: Unknown variable 
> "qemu_block_tools".
> 
> Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  meson.build | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index 808f50b07ef..e76f8f6d084 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1062,12 +1062,13 @@ if 'CONFIG_GUEST_AGENT' in config_host
>    subdir('qga')
>  endif
>  
> +qemu_block_tools = []
>  if have_tools
>    qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
>               dependencies: [authz, block, crypto, io, qom, qemuutil], 
> install: true)
>    qemu_io = executable('qemu-io', files('qemu-io.c'),
>               dependencies: [block, qemuutil], install: true)
> -  qemu_block_tools = [qemu_img, qemu_io]
> +  qemu_block_tools += [qemu_img, qemu_io]
>    if targetos == 'linux' or targetos == 'sunos' or targetos.endswith('bsd')
>      qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
>                 dependencies: [block, qemuutil], install: true)
> 

Acked-by: Paolo Bonzini <pbonzini@redhat.com>