meson.build: fix libgcrypt detection on system without libgcrypt-config
PATCH 1/1 meson.build: fix libgcrypt detection on system without libgcrypt-config
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.
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.
--- meson.build | 1 - 1 file changed, 1 deletion(-)
meson.build +0 -1
@@ -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
Signature · 1 line
2.45.2
Quoted 3 lines · Yao Zi
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.
Quoted 15 lines
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 <[email protected]>--- meson.build | 1 - 1 file changed, 1 deletion(-)meson.build +0
-0
meson.build endif · line 1700
Quoted 7 lines
meson.build +0
-1@@ -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.
With regards,
Daniel
Signature · 3 lines
|: 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 :|
Quoted 8 lines · Daniel P. Berrangé
Quoted 3 lines · Yao Zi
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 ?
Commit 2db5b5e9
("build: When no gpg-error-config, not install libgcrypt-config")[1] in libgcrypt says that
Quoted 2 lines
When system will migrate use of gpgrt-config and removal of gpg-error-config, libgcrypt-config will not be installed
1.11.0 is the first release containing this commit.
Quoted 2 lines
It still
exists in the gcrypt git repo and in Fedora 1.11.0 packages.
It does not on Arch Linux. For Fedora, I have no idea.
[1]: https://github.com/gpg/libgcrypt/commit/2db5b5e995c21c5bd9cd193c2ed1109ba9b1a440
[2]: https://archlinux.org/packages/core/x86_64/libgcrypt/
Best regards,
Yao Zi