Skip to content

Commit d4711a8

Browse files
jlbuildjlbuild
committed
LibCURL_jll build 7.73.0+0
1 parent a946412 commit d4711a8

20 files changed

+309
-1196
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
override/

‎Artifacts.toml‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,115 @@
11
[[LibCURL]]
22
arch = "aarch64"
3-
git-tree-sha1 = "0064bd998f4055cd199f9a716a4c3ce8857c1384"
3+
git-tree-sha1 = "8fa744b57f5645a9d98cec3a313996f4e8f42b46"
44
libc = "glibc"
55
os = "linux"
66

77
[[LibCURL.download]]
8-
sha256 = "b7cfd612b7c7f1e9b6046f8532ddc6bcd249fe0cca5b90eedf344ecb08a4abd0"
9-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.aarch64-linux-gnu.tar.gz"
8+
sha256 = "4611573a4001ab680481576d44fa99f26556accf9d0c9c3a85279deaafbc8238"
9+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.aarch64-linux-gnu.tar.gz"
1010
[[LibCURL]]
1111
arch = "aarch64"
12-
git-tree-sha1 = "4da22cad991ca60c2c1ca59c85ad72b8d3a55337"
12+
git-tree-sha1 = "eba94d13289b86383ced6198a647487c76935e2b"
1313
libc = "musl"
1414
os = "linux"
1515

1616
[[LibCURL.download]]
17-
sha256 = "ddbfd6a41046b8dc9a89da333074e8803b69db16eccf5039ab16828ffaa827f9"
18-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.aarch64-linux-musl.tar.gz"
17+
sha256 = "431a2a41a7ab230243c72bf48e3986fe2375d46c1ed64270f4716615b6a2a21e"
18+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.aarch64-linux-musl.tar.gz"
1919
[[LibCURL]]
2020
arch = "armv7l"
21-
git-tree-sha1 = "ae5a673ef50fa3716ae9230bd7a4e800f69798e0"
21+
call_abi = "eabihf"
22+
git-tree-sha1 = "44462aa08ddd437c3db510fd89322a70e234e40b"
2223
libc = "glibc"
2324
os = "linux"
2425

2526
[[LibCURL.download]]
26-
sha256 = "8717af3a3e9e03c30bb5a1173a6d454f1f30fca9902083faf9e445992d52cb4b"
27-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.armv7l-linux-gnueabihf.tar.gz"
27+
sha256 = "a8694c1089842a89b5e59f4d3fc4caccff9cf247c4669ea549432dde73d3e80d"
28+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.armv7l-linux-gnueabihf.tar.gz"
2829
[[LibCURL]]
2930
arch = "armv7l"
30-
git-tree-sha1 = "2959d2fe1f7e614252f2b7b3148e8b986073423a"
31+
call_abi = "eabihf"
32+
git-tree-sha1 = "e16a2bc7952a282787f25faae5b4b31b88c407bd"
3133
libc = "musl"
3234
os = "linux"
3335

3436
[[LibCURL.download]]
35-
sha256 = "870f03ce1822cb3783d5585d4bc881eafca75f399fa245d1ca8f4144a1879591"
36-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.armv7l-linux-musleabihf.tar.gz"
37+
sha256 = "d432a0d0a2b00f7e0057881b2245445309a8be418bca30c64d4f2b7e305466c5"
38+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.armv7l-linux-musleabihf.tar.gz"
3739
[[LibCURL]]
3840
arch = "i686"
39-
git-tree-sha1 = "46f77005e428d793b4f8b62f65b11553d37ab336"
41+
git-tree-sha1 = "afac3e61c13feedad9ada2b283baeede10f62e17"
4042
libc = "glibc"
4143
os = "linux"
4244

4345
[[LibCURL.download]]
44-
sha256 = "801504c8dd73aa11e1ebad032ecb86609cbafa6d006793a8c1f2d92c21b46716"
45-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.i686-linux-gnu.tar.gz"
46+
sha256 = "2be73888217d11d44bf86423d88ca5edc996a88f9517306b1dc9ea13d6e5b7c6"
47+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.i686-linux-gnu.tar.gz"
4648
[[LibCURL]]
4749
arch = "i686"
48-
git-tree-sha1 = "b3f712ed1a8776ee6b211e9fba04cd5ba009bb89"
50+
git-tree-sha1 = "0e68aeef14518caf8360530a2b6376639f0c9e6f"
4951
libc = "musl"
5052
os = "linux"
5153

5254
[[LibCURL.download]]
53-
sha256 = "4737272eaf45b33a90a92d3c36ab39766cb09a80d10844936f7aa7fac161d08d"
54-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.i686-linux-musl.tar.gz"
55+
sha256 = "fea7b4a484f5b3781e6ffd9190ca56bbdd5431caaf9b6caff2507ba54beb0cb4"
56+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.i686-linux-musl.tar.gz"
5557
[[LibCURL]]
5658
arch = "i686"
57-
git-tree-sha1 = "c98a3ed03ec134f226e6c060c4ecaddb4ddffd78"
59+
git-tree-sha1 = "c8d24b90fcee77f0abac8f36d121766857318073"
5860
os = "windows"
5961

6062
[[LibCURL.download]]
61-
sha256 = "a4de21f91395dcfb01afaef8bd2852fb2bcbb37c173c9429ccf100f0cd2066df"
62-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.i686-w64-mingw32.tar.gz"
63+
sha256 = "b97c03db12558959f4e9e5c7f1f0951eb0963d321e2174df2ba9076ccedc5db7"
64+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.i686-w64-mingw32.tar.gz"
6365
[[LibCURL]]
6466
arch = "powerpc64le"
65-
git-tree-sha1 = "f35072b02827fee7aa898490a4abd128084fc30e"
67+
git-tree-sha1 = "fd8a6eb3d178cecbf2f5f1eb0980c89538a2c888"
6668
libc = "glibc"
6769
os = "linux"
6870

6971
[[LibCURL.download]]
70-
sha256 = "851773743a8f220f146c4f66b2acc92d9b2e6a00b2b7742247dcace8b816d9a4"
71-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.powerpc64le-linux-gnu.tar.gz"
72+
sha256 = "6e16b177d74b342b968ac6c58811ad3f20b4238fb855bb47e40e8ab8304f7916"
73+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.powerpc64le-linux-gnu.tar.gz"
7274
[[LibCURL]]
7375
arch = "x86_64"
74-
git-tree-sha1 = "2b59c79c5b82d73855b3b825b5711d42e85114d3"
76+
git-tree-sha1 = "68beb902cce74e834649268fe3a95b0eaa3887d0"
7577
os = "macos"
7678

7779
[[LibCURL.download]]
78-
sha256 = "2baccce2852705d89ecf3a8de0dd73a4b51d9a88fd4b8fd6bda3709d08a41fce"
79-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.x86_64-apple-darwin14.tar.gz"
80+
sha256 = "a7c10a1af2daa75cb19aa41b74a681a8ce8e5db2f16c5395ae62d5685afe7981"
81+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.x86_64-apple-darwin.tar.gz"
8082
[[LibCURL]]
8183
arch = "x86_64"
82-
git-tree-sha1 = "2f1155c51d79440c61a695481f3cfb3e9b4e3f04"
84+
git-tree-sha1 = "020d352d4d0d89627aef72af3f72298bc4ad5c95"
8385
libc = "glibc"
8486
os = "linux"
8587

8688
[[LibCURL.download]]
87-
sha256 = "4604e972a28b32803f08b3886b78cb0bef847b12c7ca854946feeafebb88f453"
88-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.x86_64-linux-gnu.tar.gz"
89+
sha256 = "e6fa501206cb7c96a35395264917409b37004f2f074eb0509ce1d4d0b976ac8e"
90+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.x86_64-linux-gnu.tar.gz"
8991
[[LibCURL]]
9092
arch = "x86_64"
91-
git-tree-sha1 = "f58f485420509e1b2f8cb30224305da1adb17c55"
93+
git-tree-sha1 = "34f37e878b7185d1a0a6254765fcc736f6d9f91f"
9294
libc = "musl"
9395
os = "linux"
9496

9597
[[LibCURL.download]]
96-
sha256 = "37e07e08d09548d4a7b0e928b0d1ead8d0df1cb05e403b6fd65fd349c7e33c73"
97-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.x86_64-linux-musl.tar.gz"
98+
sha256 = "41b0d1a0dcb2c92c79254c0fc88747b9a2bc213700450358328584d5ac732bf8"
99+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.x86_64-linux-musl.tar.gz"
98100
[[LibCURL]]
99101
arch = "x86_64"
100-
git-tree-sha1 = "fba220544378b09602d5d6b81ff0af6630b8f5b1"
102+
git-tree-sha1 = "65b45aa8c2d6bd34e917e2be57f271520c513842"
101103
os = "freebsd"
102104

103105
[[LibCURL.download]]
104-
sha256 = "610c3879279fc2ae0ee9e57092ca771cf19993835c536cfe8e64baceccbe0a98"
105-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.x86_64-unknown-freebsd11.1.tar.gz"
106+
sha256 = "e1c79ab86526cc2d5b960e8202a9335ba473deb634e25f0a76ba32a75133bae9"
107+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.x86_64-unknown-freebsd.tar.gz"
106108
[[LibCURL]]
107109
arch = "x86_64"
108-
git-tree-sha1 = "93a125a1f028ecc90665616e44072e4da65aea23"
110+
git-tree-sha1 = "3f5465dccc316e68114290928944c315c0d60cdd"
109111
os = "windows"
110112

111113
[[LibCURL.download]]
112-
sha256 = "615f42ee7955ada11dc2f9c7e07e83252551852e6f2d22531143c9e7826f4e21"
113-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.71.1+0/LibCURL.v7.71.1.x86_64-w64-mingw32.tar.gz"
114+
sha256 = "c3675eed2ee8450c455e0bac228b8dbe64d586efa9ee37423d91624e66f60df2"
115+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.73.0+0/LibCURL.v7.73.0.x86_64-w64-mingw32.tar.gz"

‎Project.toml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
name = "LibCURL_jll"
22
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
3-
version = "7.71.1+0"
3+
version = "7.73.0+0"
44

55
[deps]
6+
JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
67
LibSSH2_jll = "29816b5a-b9ab-546f-933c-edad1886dfa8"
7-
MbedTLS_jll = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
88
nghttp2_jll = "8e850ede-7688-5339-a07c-302acd2aaf8d"
9+
MbedTLS_jll = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
910
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1011
Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a"
1112
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
13+
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
1214

1315
[compat]
14-
julia = "1.0"
16+
JLLWrappers = "1.1.0"
17+
julia = "1.6"

‎README.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1-
# `LibCURL_jll.jl` (v7.71.1+0)
1+
# `LibCURL_jll.jl` (v7.73.0+0)
22

3-
This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl). The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/e34849b38b383d01b720146bd2190db8d37f444a/L/LibCURL/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
3+
This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl). The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/4c697e5d37d6c6eb703ed6b60596f2bda3298518/L/LibCURL/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree. If you have any issue, please report it to the Yggdrasil [bug tracker](https://github.com/JuliaPackaging/Yggdrasil/issues).
44

55
For more details about JLL packages and how to use them, see `BinaryBuilder.jl` [documentation](https://juliapackaging.github.io/BinaryBuilder.jl/dev/jll/).
66

77
## Sources
88

99
The tarballs for `LibCURL_jll.jl` have been built from these sources:
1010

11-
* compressed archive: https://curl.haxx.se/download/curl-7.71.1.tar.gz (SHA256 checksum: `59ef1f73070de67b87032c72ee6037cedae71dcb1d7ef2d7f59487704aec069d`)
11+
* compressed archive: https://curl.haxx.se/download/curl-7.73.0.tar.gz (SHA256 checksum: `ba98332752257b47b9dea6d8c0ad25ec1745c20424f1dd3ff2c99ab59e97cf91`)
1212

1313
## Platforms
1414

1515
`LibCURL_jll.jl` is available for the following platforms:
1616

17-
* `Linux(:aarch64, libc=:glibc)` (`aarch64-linux-gnu`)
18-
* `Linux(:aarch64, libc=:musl)` (`aarch64-linux-musl`)
19-
* `Linux(:armv7l, libc=:glibc, call_abi=:eabihf)` (`armv7l-linux-gnueabihf`)
20-
* `Linux(:armv7l, libc=:musl, call_abi=:eabihf)` (`armv7l-linux-musleabihf`)
21-
* `Linux(:i686, libc=:glibc)` (`i686-linux-gnu`)
22-
* `Linux(:i686, libc=:musl)` (`i686-linux-musl`)
23-
* `Windows(:i686)` (`i686-w64-mingw32`)
24-
* `Linux(:powerpc64le, libc=:glibc)` (`powerpc64le-linux-gnu`)
25-
* `MacOS(:x86_64)` (`x86_64-apple-darwin14`)
26-
* `Linux(:x86_64, libc=:glibc)` (`x86_64-linux-gnu`)
27-
* `Linux(:x86_64, libc=:musl)` (`x86_64-linux-musl`)
28-
* `FreeBSD(:x86_64)` (`x86_64-unknown-freebsd11.1`)
29-
* `Windows(:x86_64)` (`x86_64-w64-mingw32`)
17+
* `Linux aarch64 {libc=glibc}` (`aarch64-linux-gnu`)
18+
* `Linux aarch64 {libc=musl}` (`aarch64-linux-musl`)
19+
* `Linux armv7l {call_abi=eabihf, libc=glibc}` (`armv7l-linux-gnueabihf`)
20+
* `Linux armv7l {call_abi=eabihf, libc=musl}` (`armv7l-linux-musleabihf`)
21+
* `Linux i686 {libc=glibc}` (`i686-linux-gnu`)
22+
* `Linux i686 {libc=musl}` (`i686-linux-musl`)
23+
* `Windows i686` (`i686-w64-mingw32`)
24+
* `Linux powerpc64le {libc=glibc}` (`powerpc64le-linux-gnu`)
25+
* `macOS x86_64` (`x86_64-apple-darwin`)
26+
* `Linux x86_64 {libc=glibc}` (`x86_64-linux-gnu`)
27+
* `Linux x86_64 {libc=musl}` (`x86_64-linux-musl`)
28+
* `FreeBSD x86_64` (`x86_64-unknown-freebsd`)
29+
* `Windows x86_64` (`x86_64-w64-mingw32`)
3030

3131
## Dependencies
3232

‎src/LibCURL_jll.jl‎

Lines changed: 8 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,9 @@
1-
module LibCURL_jll
2-
3-
if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@optlevel"))
4-
@eval Base.Experimental.@optlevel 0
5-
end
6-
7-
if VERSION < v"1.3.0-rc4"
8-
# We lie a bit in the registry that JLL packages are usable on Julia 1.0-1.2.
9-
# This is to allow packages that might want to support Julia 1.0 to get the
10-
# benefits of a JLL package on 1.3 (requiring them to declare a dependence on
11-
# this JLL package in their Project.toml) but engage in heroic hacks to do
12-
# something other than actually use a JLL package on 1.0-1.2. By allowing
13-
# this package to be installed (but not loaded) on 1.0-1.2, we enable users
14-
# to avoid splitting their package versions into pre-1.3 and post-1.3 branches
15-
# if they are willing to engage in the kinds of hoop-jumping they might need
16-
# to in order to install binaries in a JLL-compatible way on 1.0-1.2. One
17-
# example of this hoop-jumping being to express a dependency on this JLL
18-
# package, then import it within a `VERSION >= v"1.3"` conditional, and use
19-
# the deprecated `build.jl` mechanism to download the binaries through e.g.
20-
# `BinaryProvider.jl`. This should work well for the simplest packages, and
21-
# require greater and greater heroics for more and more complex packages.
22-
error("Unable to import LibCURL_jll on Julia versions older than 1.3!")
23-
end
24-
25-
using Pkg, Pkg.BinaryPlatforms, Pkg.Artifacts, Libdl
26-
import Base: UUID
27-
28-
# We put these inter-JLL-package API values here so that they are always defined, even if there
29-
# is no underlying wrapper held within this JLL package.
30-
const PATH_list = String[]
31-
const LIBPATH_list = String[]
32-
33-
# Load Artifacts.toml file
34-
artifacts_toml = joinpath(@__DIR__, "..", "Artifacts.toml")
35-
36-
# Extract all platforms
37-
artifacts = Pkg.Artifacts.load_artifacts_toml(artifacts_toml; pkg_uuid=UUID("deac9b47-8bc7-5906-a0fe-35ac56dc84c0"))
38-
platforms = [Pkg.Artifacts.unpack_platform(e, "LibCURL", artifacts_toml) for e in artifacts["LibCURL"]]
39-
40-
# Filter platforms based on what wrappers we've generated on-disk
41-
filter!(p -> isfile(joinpath(@__DIR__, "wrappers", replace(triplet(p), "arm-" => "armv7l-") * ".jl")), platforms)
42-
43-
# From the available options, choose the best platform
44-
best_platform = select_platform(Dict(p => triplet(p) for p in platforms))
45-
46-
# Silently fail if there's no binaries for this platform
47-
if best_platform === nothing
48-
@debug("Unable to load LibCURL; unsupported platform $(triplet(platform_key_abi()))")
49-
else
50-
# Load the appropriate wrapper. Note that on older Julia versions, we still
51-
# say "arm-linux-gnueabihf" instead of the more correct "armv7l-linux-gnueabihf",
52-
# so we manually correct for that here:
53-
best_platform = replace(best_platform, "arm-" => "armv7l-")
54-
include(joinpath(@__DIR__, "wrappers", "$(best_platform).jl"))
55-
end
56-
1+
# Use baremodule to shave off a few KB from the serialized `.ji` file
2+
baremodule LibCURL_jll
3+
using Base
4+
using Base: UUID
5+
import JLLWrappers
6+
7+
JLLWrappers.@generate_main_file_header("LibCURL")
8+
JLLWrappers.@generate_main_file("LibCURL", UUID("deac9b47-8bc7-5906-a0fe-35ac56dc84c0"))
579
end # module LibCURL_jll

‎src/wrappers/aarch64-linux-gnu.jl‎

Lines changed: 17 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2,89 +2,24 @@
22
export curl, libcurl
33

44
using LibSSH2_jll
5-
using MbedTLS_jll
65
using Zlib_jll
76
using nghttp2_jll
8-
## Global variables
9-
PATH = ""
10-
LIBPATH = ""
11-
LIBPATH_env = "LD_LIBRARY_PATH"
12-
LIBPATH_default = ""
13-
14-
# Relative path to `curl`
15-
const curl_splitpath = ["bin", "curl"]
16-
17-
# This will be filled out by __init__() for all products, as it must be done at runtime
18-
curl_path = ""
19-
20-
# curl-specific global declaration
21-
function curl(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true)
22-
global PATH, LIBPATH
23-
env_mapping = Dict{String,String}()
24-
if adjust_PATH
25-
if !isempty(get(ENV, "PATH", ""))
26-
env_mapping["PATH"] = string(PATH, ':', ENV["PATH"])
27-
else
28-
env_mapping["PATH"] = PATH
29-
end
30-
end
31-
if adjust_LIBPATH
32-
LIBPATH_base = get(ENV, LIBPATH_env, expanduser(LIBPATH_default))
33-
if !isempty(LIBPATH_base)
34-
env_mapping[LIBPATH_env] = string(LIBPATH, ':', LIBPATH_base)
35-
else
36-
env_mapping[LIBPATH_env] = LIBPATH
37-
end
38-
end
39-
withenv(env_mapping...) do
40-
f(curl_path)
41-
end
42-
end
43-
44-
45-
# Relative path to `libcurl`
46-
const libcurl_splitpath = ["lib", "libcurl.so"]
47-
48-
# This will be filled out by __init__() for all products, as it must be done at runtime
49-
libcurl_path = ""
50-
51-
# libcurl-specific global declaration
52-
# This will be filled out by __init__()
53-
libcurl_handle = C_NULL
54-
55-
# This must be `const` so that we can use it with `ccall()`
56-
const libcurl = "libcurl.so.4"
57-
58-
59-
"""
60-
Open all libraries
61-
"""
7+
using MbedTLS_jll
8+
JLLWrappers.@generate_wrapper_header("LibCURL")
9+
JLLWrappers.@declare_executable_product(curl)
10+
JLLWrappers.@declare_library_product(libcurl, "libcurl.so.4")
6211
function __init__()
63-
global artifact_dir = abspath(artifact"LibCURL")
64-
65-
# Initialize PATH and LIBPATH environment variable listings
66-
global PATH_list, LIBPATH_list
67-
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
68-
# then append them to our own.
69-
foreach(p -> append!(PATH_list, p), (LibSSH2_jll.PATH_list, MbedTLS_jll.PATH_list, Zlib_jll.PATH_list, nghttp2_jll.PATH_list,))
70-
foreach(p -> append!(LIBPATH_list, p), (LibSSH2_jll.LIBPATH_list, MbedTLS_jll.LIBPATH_list, Zlib_jll.LIBPATH_list, nghttp2_jll.LIBPATH_list,))
71-
72-
global curl_path = normpath(joinpath(artifact_dir, curl_splitpath...))
73-
74-
push!(PATH_list, dirname(curl_path))
75-
global libcurl_path = normpath(joinpath(artifact_dir, libcurl_splitpath...))
76-
77-
# Manually `dlopen()` this right now so that future invocations
78-
# of `ccall` with its `SONAME` will find this path immediately.
79-
global libcurl_handle = dlopen(libcurl_path)
80-
push!(LIBPATH_list, dirname(libcurl_path))
81-
82-
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
83-
filter!(!isempty, unique!(PATH_list))
84-
filter!(!isempty, unique!(LIBPATH_list))
85-
global PATH = join(PATH_list, ':')
86-
global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')
87-
88-
12+
JLLWrappers.@generate_init_header(LibSSH2_jll, Zlib_jll, nghttp2_jll, MbedTLS_jll)
13+
JLLWrappers.@init_executable_product(
14+
curl,
15+
"bin/curl",
16+
)
17+
18+
JLLWrappers.@init_library_product(
19+
libcurl,
20+
"lib/libcurl.so",
21+
RTLD_LAZY | RTLD_DEEPBIND,
22+
)
23+
24+
JLLWrappers.@generate_init_footer()
8925
end # __init__()
90-

0 commit comments

Comments
 (0)