averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: fix OpenSSL fallback when not explicitly required

Browse Source 
When OpenSSL isn't provided by the system we know to fall back to the
subproject wrapper. This is especially helpful on Windows systems, where
you typically don't have OpenSSL available, in order to reduce the
number of required dependencies.

The fallback is broken though when the OpenSSL backend is set to 'auto'
as we end up calling `dependency('openssl', required: false)` in that
case, which implicitly disables falling back to the wrapper.

Fix the issue by re-allowing the fallback in case either OpenSSL is
required or in case the backend is set to 'auto'. While at it, fix
reporting of the backend in case the user asked us to pick no HTTPS
backend at all.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-02-26 09:22:12 +01:00
committed by Junio C Hamano
parent bd262d07b6
commit 6128301075
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meson.build
View File

@@ -1352,7 +1352,11 @@ if https_backend == 'auto' and security_framework.found()
endif endif
openssl_required = 'openssl' in [csprng_backend, https_backend, sha1_backend, sha1_unsafe_backend, sha256_backend] openssl_required = 'openssl' in [csprng_backend, https_backend, sha1_backend, sha1_unsafe_backend, sha256_backend]
openssl = dependency('openssl', required: openssl_required, default_options: ['default_library=static']) openssl = dependency('openssl',
required: openssl_required,
allow_fallback: openssl_required or https_backend == 'auto',
default_options: ['default_library=static'],
)
if https_backend == 'auto' and openssl.found() if https_backend == 'auto' and openssl.found()
https_backend = 'openssl' https_backend = 'openssl'
endif endif
@@ -1366,6 +1370,7 @@ elif https_backend == 'openssl'
else else
# We either couldn't find any dependencies with 'auto' or the user requested # We either couldn't find any dependencies with 'auto' or the user requested
# 'none'. Both cases are benign. # 'none'. Both cases are benign.
https_backend = 'none'
endif endif
if https_backend != 'openssl' if https_backend != 'openssl'