diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-12-30 15:24:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-30 15:50:45 +0100 |
| commit | d6787d975147a74f1560fffc09dcb2a1f92460bb (patch) | |
| tree | ae18d052164c2414760b327db9236bfc6d409bfb | |
| parent | meson: deduplicate access to SHA1/SHA256 backend options (diff) | |
| download | git-d6787d975147a74f1560fffc09dcb2a1f92460bb.tar.xz git-d6787d975147a74f1560fffc09dcb2a1f92460bb.zip | |
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 <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
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' |