Skip to content

Commit 553ba3f

Browse files
ViralBShahgiordano
andauthored
[CURL] Update binaries for 7.81 to include all architectures (#12342)
* [CURL] Update binaries for 7.81 to include all architectures * Update L/LibCURL/LibCURL@7/build_tarballs.jl Co-authored-by: Mosè Giordano <[email protected]> --------- Co-authored-by: Viral B. Shah <[email protected]> Co-authored-by: Mosè Giordano <[email protected]>
1 parent 6b05bc8 commit 553ba3f

File tree

2 files changed

+4
-84
lines changed

2 files changed

+4
-84
lines changed
Lines changed: 2 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,5 @@
1-
# Note that this script can accept some limited command-line arguments, run
2-
# `julia build_tarballs.jl --help` to see a usage message.
3-
using BinaryBuilder
1+
include("../common.jl")
42

5-
name = "LibCURL"
6-
version = v"7.73.0"
7-
8-
# Collection of sources required to build LibCURL
9-
sources = [
10-
ArchiveSource("https://curl.haxx.se/download/curl-$(version).tar.gz",
11-
"ba98332752257b47b9dea6d8c0ad25ec1745c20424f1dd3ff2c99ab59e97cf91"),
12-
]
13-
14-
# Bash recipe for building across all platforms
15-
script = raw"""
16-
cd $WORKSPACE/srcdir/curl-*
17-
18-
# Holy crow we really configure the bitlets out of this thing
19-
FLAGS=(
20-
# Disable....almost everything
21-
--without-ssl --without-gnutls --without-gssapi
22-
--without-libidn --without-libidn2 --without-libmetalink --without-librtmp
23-
--without-nss --without-polarssl
24-
--without-spnego --without-libpsl --disable-ares --disable-manual
25-
--disable-ldap --disable-ldaps --without-zsh-functions-dir
26-
--disable-static
27-
28-
# A few things we actually enable
29-
--with-libssh2=${prefix} --with-zlib=${prefix} --with-nghttp2=${prefix}
30-
--disable-versioned-symbols
31-
)
32-
33-
34-
if [[ ${target} == *mingw* ]]; then
35-
# We need to tell it where to find libssh2 on windows
36-
FLAGS+=(LDFLAGS="${LDFLAGS} -L${prefix}/bin")
37-
38-
# We also need to tell it to link against schannel (native TLS library)
39-
FLAGS+=(--with-schannel)
40-
elif [[ ${target} == *darwin* ]]; then
41-
# On Darwin, we need to use SecureTransport (native TLS library)
42-
FLAGS+=(--with-secure-transport)
43-
44-
# We need to explicitly request a higher `-mmacosx-version-min` here, so that it doesn't
45-
# complain about: `Symbol not found: ___isOSVersionAtLeast`
46-
if [[ "${target}" == aarch64* ]]; then
47-
export CFLAGS=-mmacosx-version-min=11.0
48-
else
49-
export CFLAGS=-mmacosx-version-min=10.11
50-
fi
51-
else
52-
# On all other systems, we use MbedTLS
53-
FLAGS+=(--with-mbedtls=${prefix})
54-
fi
55-
56-
atomic_patch -p1 $WORKSPACE/srcdir/patches/0001-socks-return-error-if-hostname-too-long-for-remote-r.patch || true
57-
58-
./configure --prefix=$prefix --host=$target --build=${MACHTYPE} "${FLAGS[@]}"
59-
make -j${nproc}
60-
make install
61-
install_license COPYING
62-
"""
63-
64-
# These are the platforms we will build for by default, unless further
65-
# platforms are passed in on the command line
66-
platforms = supported_platforms()
67-
68-
# The products that we will ensure are always built
69-
products = [
70-
LibraryProduct("libcurl", :libcurl),
71-
]
72-
73-
# Dependencies that must be installed before this package can be built
74-
dependencies = [
75-
Dependency("LibSSH2_jll"; compat="1.9.1"),
76-
Dependency("Zlib_jll"; compat="1.2.12"),
77-
Dependency("nghttp2_jll"; compat="1.41.0"),
78-
# Note that while we unconditionally list MbedTLS as a dependency,
79-
# we default to schannel/SecureTransport on Windows/MacOS.
80-
Dependency("MbedTLS_jll"; compat="2.24.0"),
81-
]
82-
83-
# Build the tarballs, and possibly a `build.jl` as well.
84-
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6")
3+
build_libcurl(ARGS, "LibCURL", v"7.81.0"; with_zstd=false)
854

865
# Build trigger: 2

L/LibCURL/common.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ using BinaryBuilder, Pkg
44
using BinaryBuilderBase: sanitize, get_addable_spec
55

66
const curl_hashes = Dict(
7+
v"7.81.0" => "ac8e1087711084548d788ef18b9b732c8de887457b81f616fc681d1044b32f98",
78
v"7.88.1" => "cdb38b72e36bc5d33d5b8810f8018ece1baa29a8f215b4495e495ded82bbf3c7",
89
v"8.2.1" => "f98bdb06c0f52bdd19e63c4a77b5eb19b243bcbbd0f5b002b9f3cba7295a3a42",
910
v"8.4.0" => "816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f1a9e427",
@@ -64,7 +65,7 @@ function build_libcurl(ARGS, name::String, version::VersionNumber; with_zstd=fal
6465
without_nss = version < v"8.16.0"
6566

6667
config = "THIS_IS_CURL=$(this_is_curl_jll)\n"
67-
config *= "MACOS_USE_OPENSSL=$(macos_use_openssl)\n"
68+
config *= "MACOS_USE_OPENSSL=$(macos_use_openssl)\n"
6869
if with_zstd
6970
config *= "HAVE_ZSTD=true\n"
7071
end

0 commit comments

Comments
 (0)