On Sat, Jul 06, 2024 at 08:12:26PM +0000, Yao Zi wrote: > libgcrypt starts providing correct pkg-config configuration and dropping > libgcrypt-config since 1.11.0. So use auto method for detection of > libgcrypt, in which meson will try both pkg-config and libgcrypt-config.
The pkg-config file seems to be provided since 1.9 in fact. Where do you see that ligcrypt-config is dropped ? It still exists in the gcrypt git repo and in Fedora 1.11.0 packages. > > This fixes build failure when libgcrypt is enabled on a system without > ligcrypt-config. Auto method for libgcrypt is supported by meson since > 0.49.0, which is higher than the version qemu requires. > > Signed-off-by: Yao Zi <zi...@disroot.org> > --- > meson.build | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meson.build b/meson.build > index 6a93da48e1..1b71824548 100644 > --- a/meson.build > +++ b/meson.build > @@ -1695,7 +1695,6 @@ endif > if not gnutls_crypto.found() > if (not get_option('gcrypt').auto() or have_system) and not > get_option('nettle').enabled() > gcrypt = dependency('libgcrypt', version: '>=1.8', > - method: 'config-tool', > required: get_option('gcrypt')) > # Debian has removed -lgpg-error from libgcrypt-config > # as it "spreads unnecessary dependencies" which in Despite the misleading commit message the change is good and I'll queue it. Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|