From: Patrick Steinhardt Date: Mon, 30 Dec 2024 14:24:06 +0000 (+0100) Subject: meson: require SecurityFramework when it's used as SHA1 backend X-Git-Tag: v2.49.0-rc0~103^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6787d975147a74f1560fffc09dcb2a1f92460bb;p=thirdparty%2Fgit.git meson: require SecurityFramework when it's used as SHA1 backend The Security framework is required when we use CommonCrypto either as HTTPS or SHA1 backend, but we only require it in case it is set up as HTTPS backend. Fix this. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- diff --git a/meson.build b/meson.build index 6fa4d900ee..bc75ad954a 100644 --- a/meson.build +++ b/meson.build @@ -1329,7 +1329,7 @@ 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') +security_framework = dependency('Security', required: https_backend == 'CommonCrypto' or sha1_backend == 'CommonCrypto') core_foundation_framework = dependency('CoreFoundation', required: security_framework.found()) if https_backend == 'auto' and security_framework.found() https_backend = 'CommonCrypto'