From: Paolo Bonzini Date: Fri, 28 Aug 2020 17:32:40 +0000 (+0200) Subject: block: always link with zlib X-Git-Tag: v5.2.0-rc0~144^2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a10c8516ed59c1e4c0db9b0d9050960ed861703d;p=thirdparty%2Fqemu.git block: always link with zlib 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 Reviewed-by: Thomas Huth Cc: qemu-block@nongnu.org Signed-off-by: Paolo Bonzini --- diff --git a/block/meson.build b/block/meson.build index 4dbbfe60b46..a3e56b7cd11 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'))