Le ven. 28 août 2020 19:33, Paolo Bonzini <[email protected]> a écrit :
> The qcow2 driver needs the zlib dependency. While emulators > provided it through the migration code, this is not true of > the tools. Move the dependency from the qcow1 rule directly > into block_ss so that it is included unconditionally. > > Fixes build with --disable-qcow1. > > Reported-by: Thomas Huth <[email protected]> > Cc: [email protected] > Signed-off-by: Paolo Bonzini <[email protected]> > Reviewed-by: Philippe Mathieu-Daudé <[email protected]> --- > block/meson.build | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block/meson.build b/block/meson.build > index 4dbbfe60b4..a3e56b7cd1 100644 > --- a/block/meson.build > +++ b/block/meson.build > @@ -40,9 +40,9 @@ block_ss.add(files( > 'vmdk.c', > 'vpc.c', > 'write-threshold.c', > -), zstd) > +), zstd, zlib) > > -block_ss.add(when: [zlib, 'CONFIG_QCOW1'], if_true: files('qcow.c')) > +block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c')) > block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c')) > block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c')) > block_ss.add(when: 'CONFIG_BOCHS', if_true: files('bochs.c')) > -- > 2.26.2 > > >
