| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 1 | From d8265abdce5dc2bf74b3fccdf2b7257b4f3894f0 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 79641f2 | 2019-09-10 07:20:22 -0400 | [diff] [blame] | 2 | From: He Zhe <zhe.he@windriver.com> |
| 3 | Date: Wed, 28 Aug 2019 19:56:28 +0800 |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 04/12] configure: Add pkg-config handling for libgcrypt |
| Brad Bishop | 79641f2 | 2019-09-10 07:20:22 -0400 | [diff] [blame] | 5 | |
| 6 | libgcrypt may also be controlled by pkg-config, this patch adds pkg-config |
| 7 | handling for libgcrypt. |
| 8 | |
| 9 | Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html] |
| 10 | |
| 11 | Signed-off-by: He Zhe <zhe.he@windriver.com> |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 12 | |
| Brad Bishop | 79641f2 | 2019-09-10 07:20:22 -0400 | [diff] [blame] | 13 | --- |
| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 14 | meson.build | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| Brad Bishop | 79641f2 | 2019-09-10 07:20:22 -0400 | [diff] [blame] | 16 | |
| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 17 | diff --git a/meson.build b/meson.build |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 18 | index 861de93c4..d45ff2d7c 100644 |
| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 19 | --- a/meson.build |
| 20 | +++ b/meson.build |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 21 | @@ -1063,7 +1063,7 @@ endif |
| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 22 | if not gnutls_crypto.found() |
| 23 | if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() |
| 24 | gcrypt = dependency('libgcrypt', version: '>=1.8', |
| 25 | - method: 'config-tool', |
| 26 | + method: 'pkg-config', |
| 27 | required: get_option('gcrypt'), |
| 28 | kwargs: static_kwargs) |
| 29 | # Debian has removed -lgpg-error from libgcrypt-config |
| Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 30 | -- |
| 31 | 2.30.2 |
| 32 | |