From ab296450b4fa6903d4ac31a393892280629f7093 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Fri, 29 Mar 2024 00:29:05 +0100 Subject: [PATCH] LibCURL: use OpenSSL --- L/LibCURL/LibCURL@8/build_tarballs.jl | 2 ++ L/LibCURL/common.jl | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/L/LibCURL/LibCURL@8/build_tarballs.jl b/L/LibCURL/LibCURL@8/build_tarballs.jl index f35ea9cf02a..1889566d72d 100644 --- a/L/LibCURL/LibCURL@8/build_tarballs.jl +++ b/L/LibCURL/LibCURL@8/build_tarballs.jl @@ -1,3 +1,5 @@ include("../common.jl") build_libcurl(ARGS, "LibCURL", v"8.7.1") + +# Build trigger: 2 diff --git a/L/LibCURL/common.jl b/L/LibCURL/common.jl index a78d3b68216..a516e8e80b0 100644 --- a/L/LibCURL/common.jl +++ b/L/LibCURL/common.jl @@ -74,8 +74,8 @@ function build_libcurl(ARGS, name::String, version::VersionNumber) export CFLAGS=-mmacosx-version-min=10.11 fi else - # On all other systems, we use MbedTLS - FLAGS+=(--with-mbedtls=${prefix}) + # On all other systems, we use OpenSSL + FLAGS+=(--with-openssl) fi if false; then @@ -128,9 +128,7 @@ function build_libcurl(ARGS, name::String, version::VersionNumber) Dependency("LibSSH2_jll"), Dependency("Zlib_jll"), Dependency("nghttp2_jll"), - # Note that while we unconditionally list MbedTLS as a dependency, - # we default to schannel/SecureTransport on Windows/MacOS. - Dependency("MbedTLS_jll"; compat="~2.28.0", platforms=filter(p->Sys.islinux(p) || Sys.isfreebsd(p), platforms)), + Dependency("OpenSSL_jll"; compat="3.0.8", platforms=filter(p->Sys.islinux(p) || Sys.isfreebsd(p), platforms)), # Dependency("Kerberos_krb5_jll"; platforms=filter(p->Sys.islinux(p) || Sys.isfreebsd(p), platforms)), BuildDependency(PackageSpec(name="LLVMCompilerRT_jll", uuid="4e17d02c-6bf5-513e-be62-445f41c75a11", version=llvm_version); platforms=filter(p -> sanitize(p)=="memory", platforms)),