Skip to content

Commit be162fa

Browse files
jlbuildjlbuild
committed
LibCURL_jll build 7.66.0+1
1 parent 5828f73 commit be162fa

17 files changed

+450
-372
lines changed

‎Artifacts.toml‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,113 @@
11
[[LibCURL]]
2-
arch = "x86_64"
3-
git-tree-sha1 = "b811872df5e27a4da33e0869a8ee3a376d1f5b57"
4-
os = "macos"
2+
arch = "armv7l"
3+
git-tree-sha1 = "5731e94570453ac7af61cbf2aea57b173289992a"
4+
libc = "glibc"
5+
os = "linux"
56

67
[[LibCURL.download]]
7-
sha256 = "2c44ac08598266c49caac35664e61b973cebcaffed3c72668c8aee369abb3d9f"
8-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.x86_64-apple-darwin14.tar.gz"
8+
sha256 = "d9625c5e86db0ab773e9dce0be295823e97add57563502614d0d60dce0f2a15e"
9+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.arm-linux-gnueabihf.tar.gz"
910
[[LibCURL]]
10-
arch = "i686"
11-
git-tree-sha1 = "33b20ec0743fb370f227d269feb5885c8a130fc1"
11+
arch = "x86_64"
12+
git-tree-sha1 = "792f5afd7362a36e6ebdbaeec292a29da863d539"
1213
libc = "glibc"
1314
os = "linux"
1415

1516
[[LibCURL.download]]
16-
sha256 = "da7a0acea3b3f16a595651f803ea275eb3962c540a6b37b59aa8eeffca6a46bb"
17-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.i686-linux-gnu.tar.gz"
17+
sha256 = "f0b4ff423fc3edfa3a1c8c3b1d916765fdee05e82867adf55f83c7aba644b816"
18+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.x86_64-linux-gnu.tar.gz"
1819
[[LibCURL]]
19-
arch = "x86_64"
20-
git-tree-sha1 = "9390efd4e7c7ebd8e5d8f5727099f4bae8e61d40"
21-
os = "freebsd"
20+
arch = "aarch64"
21+
git-tree-sha1 = "d95d7b40aa8765c95b168c396173a58d9e466508"
22+
libc = "musl"
23+
os = "linux"
2224

2325
[[LibCURL.download]]
24-
sha256 = "a048405b806b3c231756d4afadbf98c948798da80536f8b7bb0716d83f815535"
25-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.x86_64-unknown-freebsd11.1.tar.gz"
26+
sha256 = "92f438e59c789c6d1f85efed56b8a26d0b3d2b066076ec18ebf60100b54197d4"
27+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.aarch64-linux-musl.tar.gz"
2628
[[LibCURL]]
2729
arch = "powerpc64le"
28-
git-tree-sha1 = "1f3f14e02f4eb118348c3f22e4ad15128cf1e988"
30+
git-tree-sha1 = "95ed979eb016869f0a21ebbe5990fcfd9c5cc1d6"
2931
libc = "glibc"
3032
os = "linux"
3133

3234
[[LibCURL.download]]
33-
sha256 = "b18bab20252dae286388336ce8ce8438f5f15bad0a5e089e2891b94bd21b3cda"
34-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.powerpc64le-linux-gnu.tar.gz"
35+
sha256 = "b10c7e12bedf620cf345ab9580944ee9f90e66e0ee57468e4035bf5d78de1987"
36+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.powerpc64le-linux-gnu.tar.gz"
3537
[[LibCURL]]
3638
arch = "x86_64"
37-
git-tree-sha1 = "d8371e2273bfe6dc372152d12c6741f73a357179"
38-
libc = "musl"
39-
os = "linux"
39+
git-tree-sha1 = "37daa7c81d6801b619da8e904b8a82f3b3ef578b"
40+
os = "macos"
4041

4142
[[LibCURL.download]]
42-
sha256 = "356faf8b8ba95e661fdaf6e7ce45e38f7ca25356d994036355f4229710ddfbbc"
43-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.x86_64-linux-musl.tar.gz"
43+
sha256 = "a49798356a38ce5ea2c9a9fb05a702766e466deab3481f23cfd72dca908b7e47"
44+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.x86_64-apple-darwin14.tar.gz"
4445
[[LibCURL]]
4546
arch = "x86_64"
46-
git-tree-sha1 = "e20ee45a3e2979763d59f6f95a610ab20e039bae"
47-
libc = "glibc"
47+
git-tree-sha1 = "8c820ad8f39670c1fd2d4f07e7e87dfcf8f40307"
48+
libc = "musl"
4849
os = "linux"
4950

5051
[[LibCURL.download]]
51-
sha256 = "cde800aa3b06dc65038a15f12fbe14dc5bcd945fd006b305ae64e46ade7b88cd"
52-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.x86_64-linux-gnu.tar.gz"
52+
sha256 = "bef1f3f8c31952b18a1a9f9018ded43d918671b14843846dd25ff8793a123fd2"
53+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.x86_64-linux-musl.tar.gz"
5354
[[LibCURL]]
5455
arch = "x86_64"
55-
git-tree-sha1 = "a53a4b6ee899f5d8873cbcfc00c917fb4617b4f5"
56+
git-tree-sha1 = "aab55b4af1b5e509dcfea06875e654bc14bf8b91"
5657
os = "windows"
5758

5859
[[LibCURL.download]]
59-
sha256 = "b5af30553ec752ec9bf1d5ba0df25212857132c6834ebb48847164dfb0152eb4"
60-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.x86_64-w64-mingw32.tar.gz"
60+
sha256 = "198f4682b30367dc708f0f28fab5c3e8ff85cbfcf8d1f824586a7cdf6c6499bc"
61+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.x86_64-w64-mingw32.tar.gz"
6162
[[LibCURL]]
62-
arch = "aarch64"
63-
git-tree-sha1 = "7046378507d9cb046fea74638e2aa314ec796eff"
64-
libc = "musl"
63+
arch = "i686"
64+
git-tree-sha1 = "bd4fbba971b4c16c4ccd0d90f5ca8c57dbbe4e83"
65+
libc = "glibc"
6566
os = "linux"
6667

6768
[[LibCURL.download]]
68-
sha256 = "b74f93ee481cb43a719b8f50fc1e0550d5f58ac3dd11392756594421267decc0"
69-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.aarch64-linux-musl.tar.gz"
69+
sha256 = "caca1f1611ec39d6c175e7d46013dfac8ce0f5d5b53cdef5ee7b23b1657dbb0b"
70+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.i686-linux-gnu.tar.gz"
7071
[[LibCURL]]
71-
arch = "armv7l"
72-
git-tree-sha1 = "e657f2e1bf446ccefe61fc4bef4d5e3ee5a9488e"
72+
arch = "aarch64"
73+
git-tree-sha1 = "5cbaa5d2c3c05f8cb371090991dfd2970d0cc6bd"
7374
libc = "glibc"
7475
os = "linux"
7576

7677
[[LibCURL.download]]
77-
sha256 = "50d5d5402816125da4337a8a2cf6fe6adccc1dbe95954b8d13873a9d81d613cc"
78-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.arm-linux-gnueabihf.tar.gz"
78+
sha256 = "b4e8bed54e591e82682b78ce769ec60fd8295ec00efdf8bb25d9f8823f572d01"
79+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.aarch64-linux-gnu.tar.gz"
7980
[[LibCURL]]
8081
arch = "i686"
81-
git-tree-sha1 = "f0c7d90d85182ea27ce4e42de5e4d21594245488"
82+
git-tree-sha1 = "0ed379ccd87f3b4cdba9a133f8e94fa3dfc7357e"
8283
libc = "musl"
8384
os = "linux"
8485

8586
[[LibCURL.download]]
86-
sha256 = "174bc93e1ac538dce1f9e193b7a75775a2d3858794e4a6e23c4e3f18b097bebf"
87-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.i686-linux-musl.tar.gz"
87+
sha256 = "94f073825c67770722607fef5cb28a32e5c54c9a8479c0ad22e0d847587f26ae"
88+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.i686-linux-musl.tar.gz"
8889
[[LibCURL]]
89-
arch = "armv7l"
90-
git-tree-sha1 = "f31ac6973e44868bc1ef0efdd7837494a9f41c02"
91-
libc = "musl"
92-
os = "linux"
90+
arch = "x86_64"
91+
git-tree-sha1 = "8591e5aa9245d61bfccf4fd5ca49dc2863a9f098"
92+
os = "freebsd"
9393

9494
[[LibCURL.download]]
95-
sha256 = "5bd9ce630f1306c6eb9f79bd6901ba091cad4eedc92863318913b7bb4fa8f3af"
96-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.arm-linux-musleabihf.tar.gz"
95+
sha256 = "ea05921cefe331387df18794bb9502caeb99cd9e6f1c575ce96f03671e93bc0b"
96+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.x86_64-unknown-freebsd11.1.tar.gz"
9797
[[LibCURL]]
98-
arch = "aarch64"
99-
git-tree-sha1 = "35f5d938aaad8c22c31f0412799c6f616ab01ec6"
100-
libc = "glibc"
101-
os = "linux"
98+
arch = "i686"
99+
git-tree-sha1 = "65a9375e843e08b9ae928f6341a064dc442a6ab1"
100+
os = "windows"
102101

103102
[[LibCURL.download]]
104-
sha256 = "809c9cf178548035059e68c1031ad508e4bdf33a7a2957dc5e5fbdd548a48f77"
105-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.aarch64-linux-gnu.tar.gz"
103+
sha256 = "538895aff2300698b7f82c82ae3415e10b21002352b3a32cdab6aea2b3158cf3"
104+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.i686-w64-mingw32.tar.gz"
106105
[[LibCURL]]
107-
arch = "i686"
108-
git-tree-sha1 = "d41e01ba9bacfa682cc0fb426bcfee1cf5a2c6d2"
109-
os = "windows"
106+
arch = "armv7l"
107+
git-tree-sha1 = "503e25c85d4815970b900b8f781ba692df104ccd"
108+
libc = "musl"
109+
os = "linux"
110110

111111
[[LibCURL.download]]
112-
sha256 = "38d30dfbb6e7fa009f3dd84aaeed5f501b8721f31164dc55dd3da293b5b6100b"
113-
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+0/LibCURL.v7.66.0.i686-w64-mingw32.tar.gz"
112+
sha256 = "f2eaa5177cc503f3b78578385cfd895374ecd198e3b48cf6f2b3b2c443a8374a"
113+
url = "https://github.com/JuliaBinaryWrappers/LibCURL_jll.jl/releases/download/LibCURL-v7.66.0+1/LibCURL.v7.66.0.arm-linux-musleabihf.tar.gz"

‎LICENSE.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Copyright 2019
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4+
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎Project.toml‎

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

55
[deps]
66
LibSSH2_jll = "29816b5a-b9ab-546f-933c-edad1886dfa8"
@@ -10,4 +10,4 @@ Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a"
1010
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1111

1212
[compat]
13-
julia = "1.3"
13+
julia = "1.0"

‎src/LibCURL_jll.jl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
11
module LibCURL_jll
2+
3+
if VERSION < v"1.3.0-rc4"
4+
# We lie a bit in the registry that JLL packages are usable on Julia 1.0-1.2.
5+
# This is to allow packages that might want to support Julia 1.0 to get the
6+
# benefits of a JLL package on 1.3 (requiring them to declare a dependence on
7+
# this JLL package in their Project.toml) but engage in heroic hacks to do
8+
# something other than actually use a JLL package on 1.0-1.2. By allowing
9+
# this package to be installed (but not loaded) on 1.0-1.2, we enable users
10+
# to avoid splitting their package versions into pre-1.3 and post-1.3 branches
11+
# if they are willing to engage in the kinds of hoop-jumping they might need
12+
# to in order to install binaries in a JLL-compatible way on 1.0-1.2. One
13+
# example of this hoop-jumping being to express a dependency on this JLL
14+
# package, then import it wtihin a `VERSION >= v"1.3"` conditional, and use
15+
# the deprecated `build.jl` mechanism to download the binaries through e.g.
16+
# `BinaryProvider.jl`. This should work well for the simplest packages, and
17+
# require greater and greater heroics for more and more complex packages.
18+
error("Unable to import LibCURL_jll on Julia versions older than 1.3!")
19+
end
20+
221
using Pkg, Pkg.BinaryPlatforms, Pkg.Artifacts, Libdl
322
import Base: UUID
423

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

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Autogenerated wrapper script for LibCURL_jll for aarch64-linux-gnu
2-
export curl, libcurl
2+
export libcurl, curl
33

44
using LibSSH2_jll
55
using MbedTLS_jll
@@ -9,6 +9,20 @@ PATH = ""
99
LIBPATH = ""
1010
LIBPATH_env = "LD_LIBRARY_PATH"
1111

12+
# Relative path to `libcurl`
13+
const libcurl_splitpath = ["lib", "libcurl.so"]
14+
15+
# This will be filled out by __init__() for all products, as it must be done at runtime
16+
libcurl_path = ""
17+
18+
# libcurl-specific global declaration
19+
# This will be filled out by __init__()
20+
libcurl_handle = C_NULL
21+
22+
# This must be `const` so that we can use it with `ccall()`
23+
const libcurl = "libcurl.so.4"
24+
25+
1226
# Relative path to `curl`
1327
const curl_splitpath = ["bin", "curl"]
1428

@@ -21,14 +35,14 @@ function curl(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true
2135
env_mapping = Dict{String,String}()
2236
if adjust_PATH
2337
if !isempty(get(ENV, "PATH", ""))
24-
env_mapping["PATH"] = string(ENV["PATH"], ':', PATH)
38+
env_mapping["PATH"] = string(PATH, ':', ENV["PATH"])
2539
else
2640
env_mapping["PATH"] = PATH
2741
end
2842
end
2943
if adjust_LIBPATH
3044
if !isempty(get(ENV, LIBPATH_env, ""))
31-
env_mapping[LIBPATH_env] = string(ENV[LIBPATH_env], ':', LIBPATH)
45+
env_mapping[LIBPATH_env] = string(LIBPATH, ':', ENV[LIBPATH_env])
3246
else
3347
env_mapping[LIBPATH_env] = LIBPATH
3448
end
@@ -39,41 +53,31 @@ function curl(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true
3953
end
4054

4155

42-
# Relative path to `libcurl`
43-
const libcurl_splitpath = ["lib", "libcurl.so"]
44-
45-
# This will be filled out by __init__() for all products, as it must be done at runtime
46-
libcurl_path = ""
47-
48-
# libcurl-specific global declaration
49-
# This will be filled out by __init__()
50-
libcurl_handle = C_NULL
51-
52-
# This must be `const` so that we can use it with `ccall()`
53-
const libcurl = "libcurl.so.4"
54-
55-
5656
"""
5757
Open all libraries
5858
"""
5959
function __init__()
60-
global prefix = abspath(joinpath(@__DIR__, ".."))
60+
global artifact_dir = abspath(artifact"LibCURL")
6161

6262
# Initialize PATH and LIBPATH environment variable listings
6363
global PATH_list, LIBPATH_list
64-
append!.(Ref(PATH_list), (LibSSH2_jll.PATH_list, MbedTLS_jll.PATH_list, Zlib_jll.PATH_list,))
65-
append!.(Ref(LIBPATH_list), (LibSSH2_jll.LIBPATH_list, MbedTLS_jll.LIBPATH_list, Zlib_jll.LIBPATH_list,))
64+
# We first need to add to LIBPATH_list the libraries provided by Julia
65+
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
66+
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
67+
# then append them to our own.
68+
foreach(p -> append!(PATH_list, p), (LibSSH2_jll.PATH_list, MbedTLS_jll.PATH_list, Zlib_jll.PATH_list,))
69+
foreach(p -> append!(LIBPATH_list, p), (LibSSH2_jll.LIBPATH_list, MbedTLS_jll.LIBPATH_list, Zlib_jll.LIBPATH_list,))
6670

67-
global curl_path = abspath(joinpath(artifact"LibCURL", curl_splitpath...))
68-
69-
push!(PATH_list, dirname(curl_path))
70-
global libcurl_path = abspath(joinpath(artifact"LibCURL", libcurl_splitpath...))
71+
global libcurl_path = normpath(joinpath(artifact_dir, libcurl_splitpath...))
7172

7273
# Manually `dlopen()` this right now so that future invocations
7374
# of `ccall` with its `SONAME` will find this path immediately.
7475
global libcurl_handle = dlopen(libcurl_path)
7576
push!(LIBPATH_list, dirname(libcurl_path))
7677

78+
global curl_path = normpath(joinpath(artifact_dir, curl_splitpath...))
79+
80+
push!(PATH_list, dirname(curl_path))
7781
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
7882
filter!(!isempty, unique!(PATH_list))
7983
filter!(!isempty, unique!(LIBPATH_list))

0 commit comments

Comments
 (0)