[PATCH 07/10] meson: simplify conditions for HTTPS and SHA1 dependencies
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Dec 30, 2024, 14:24 UTC
- Message-ID
- <20241230-pks-meson-sha1-unsafe-v1-7-efb276e171f5@pks.im>
- In-Reply-To
- <20241230-pks-meson-sha1-unsafe-v1-0-efb276e171f5@pks.im>
The conditions used to figure out whteher the Security framework or OpenSSL library is required are a bit convoluted because they can be pulled in via the HTTPS, SHA1 or SHA256 backends. Refactor them to be easier to read.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build index bc75ad954a4949342125b769d3d8d8362ef4e8a3..46f807899b7bae33dd6aa7a94a54931d69ab0d62 100644 --- a/meson.build +++ b/meson.build @@ -1329,13 +1329,13 @@ https_backend = get_option('https_backend') sha1_backend = get_option('sha1_backend') sha256_backend = get_option('sha256_backend') -security_framework = dependency('Security', required: https_backend == 'CommonCrypto' or sha1_backend == 'CommonCrypto') +security_framework = dependency('Security', required: 'CommonCrypto' in [https_backend, sha1_backend]) core_foundation_framework = dependency('CoreFoundation', required: security_framework.found()) if https_backend == 'auto' and security_framework.found() https_backend = 'CommonCrypto' endif -openssl_required = https_backend == 'openssl' or sha1_backend == 'openssl' or sha256_backend == 'openssl' +openssl_required = 'openssl' in [https_backend, sha1_backend, sha256_backend] openssl = dependency('openssl', required: openssl_required, default_options: ['default_library=static']) if https_backend == 'auto' and openssl.found() https_backend = 'openssl'
-- 2.48.0.rc0.311.gb6c66824c1.dirty