Skip to content

Commit 29cc93e

Browse files
jlbuildjlbuild
committed
LibGit2_jll build 0.28.2+1
1 parent e9276b5 commit 29cc93e

17 files changed

+204
-126
lines changed

‎Artifacts.toml‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,113 @@
11
[[LibGit2]]
2-
arch = "i686"
3-
git-tree-sha1 = "bd8d681239648b9c9fdd43b6b8de2d3189b1d8bd"
2+
arch = "armv7l"
3+
git-tree-sha1 = "5bdf78036d090d11407f53d353651d3d6f80ff35"
44
libc = "glibc"
55
os = "linux"
66

77
[[LibGit2.download]]
8-
sha256 = "b4c0f24dec32dfbc1329bfbc8f3b1a8b1e77ce3c13292e6cba86062070c3f70a"
9-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.i686-linux-gnu.tar.gz"
8+
sha256 = "a2890c3c5abea4fb265140af3b2ebef875245f4c408ab436c5d54065070c78c7"
9+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.arm-linux-gnueabihf.tar.gz"
1010
[[LibGit2]]
1111
arch = "x86_64"
12-
git-tree-sha1 = "663fe2411ff5985805f43ff9b321763e62c8bf77"
12+
git-tree-sha1 = "2d8c461c9889064592261f7eddd875f227a11156"
1313
libc = "glibc"
1414
os = "linux"
1515

1616
[[LibGit2.download]]
17-
sha256 = "53718ed08dc0f5fc483c4a15e823d0c02332da5789ffef0e48dbe241c1fef5ce"
18-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.x86_64-linux-gnu.tar.gz"
19-
[[LibGit2]]
20-
arch = "i686"
21-
git-tree-sha1 = "28733d55b59bf90d5723b4ef1f80c312209a9966"
22-
os = "windows"
23-
24-
[[LibGit2.download]]
25-
sha256 = "239cd71f292a6ef373bee9ac794a186c27828f254bc29ade8cadd2516a804b0d"
26-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.i686-w64-mingw32.tar.gz"
17+
sha256 = "7ce3953b4ade6cca02f0c7767ec8f561adc9477761564478b88626f9aa03df0e"
18+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.x86_64-linux-gnu.tar.gz"
2719
[[LibGit2]]
28-
arch = "x86_64"
29-
git-tree-sha1 = "5ca76daccf8079217d2a74dc785da06b733150c5"
20+
arch = "aarch64"
21+
git-tree-sha1 = "e2e90876c8e3db4435cccb1281c7e1108508875b"
3022
libc = "musl"
3123
os = "linux"
3224

3325
[[LibGit2.download]]
34-
sha256 = "ef99d337535adf72e29a927e0def1b52018f649cf85bc4744d5f5c881558182a"
35-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.x86_64-linux-musl.tar.gz"
26+
sha256 = "d01d0d854e158253b22fb7cc359c6d2e1e7885535c9de7a12eb406b8545bdf57"
27+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.aarch64-linux-musl.tar.gz"
3628
[[LibGit2]]
37-
arch = "armv7l"
38-
git-tree-sha1 = "6f2e9d0fc6faf872801ea50e50b565ec4a5cae3c"
29+
arch = "powerpc64le"
30+
git-tree-sha1 = "cedd40582dcc87192ad6671ecd5e59b9c4a4b64f"
3931
libc = "glibc"
4032
os = "linux"
4133

4234
[[LibGit2.download]]
43-
sha256 = "aa4cbb6652784b00f84ecb4cee3ada19e4d365c6fc0077b4ee9310a4bfffe6c9"
44-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.arm-linux-gnueabihf.tar.gz"
35+
sha256 = "0fd848e2ad072dcb950b9613832389e01bcfabe284ae4b682b893e086f74907d"
36+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.powerpc64le-linux-gnu.tar.gz"
4537
[[LibGit2]]
46-
arch = "aarch64"
47-
git-tree-sha1 = "aac95faf2d0d927a71a95a6981da07d134af1689"
48-
libc = "musl"
49-
os = "linux"
38+
arch = "x86_64"
39+
git-tree-sha1 = "e0dd75677fa27fcbfb0eb90fd393fca673375156"
40+
os = "macos"
5041

5142
[[LibGit2.download]]
52-
sha256 = "de572eae0fc857d41bd2d2390dc3e42fa3c8bc56651bca9e02446c6fd23974de"
53-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.aarch64-linux-musl.tar.gz"
43+
sha256 = "7752201f66373a12263beef9198fca4eb49bcaca5ca44b83cfc071b9d4666a3f"
44+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.x86_64-apple-darwin14.tar.gz"
5445
[[LibGit2]]
55-
arch = "powerpc64le"
56-
git-tree-sha1 = "c478f2aa3dfa9650c11c9927e562ee530570385b"
57-
libc = "glibc"
46+
arch = "x86_64"
47+
git-tree-sha1 = "83c47651c819b6a0c67475e076eebab12e461f25"
48+
libc = "musl"
5849
os = "linux"
5950

6051
[[LibGit2.download]]
61-
sha256 = "6ce545804f5f82fcc9d9354bf2a9dbf26918cbd7a7dd45837e8cebc6e3a59110"
62-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.powerpc64le-linux-gnu.tar.gz"
52+
sha256 = "fd282b8a7810f649bfec755d3fd43db5d269e8605e191c289a983e19cc8dd379"
53+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.x86_64-linux-musl.tar.gz"
6354
[[LibGit2]]
6455
arch = "x86_64"
65-
git-tree-sha1 = "0f536bf36c44545b4cca93351429763042940545"
66-
os = "freebsd"
56+
git-tree-sha1 = "7f48df037a4b056d1fbc42b3dca5758205beda64"
57+
os = "windows"
6758

6859
[[LibGit2.download]]
69-
sha256 = "4f911b01d890f6166bf958977105d4b5893b09da8f3947b2f3bc074c22bba02f"
70-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.x86_64-unknown-freebsd11.1.tar.gz"
60+
sha256 = "575fae04ba232ba275a1f367425e775052a6e1a0bb7970d1fcb4214c118a0580"
61+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.x86_64-w64-mingw32.tar.gz"
7162
[[LibGit2]]
72-
arch = "aarch64"
73-
git-tree-sha1 = "a2f2f4494acfbeae0d421b90fc7cb2eff3f2157b"
63+
arch = "i686"
64+
git-tree-sha1 = "22c49ba3bddf48480255b69fd57ad290e8592bd9"
7465
libc = "glibc"
7566
os = "linux"
7667

7768
[[LibGit2.download]]
78-
sha256 = "8558861664279e00c548ae460cd876a7503a8e42fc4c61ba8b264cdb5b370720"
79-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.aarch64-linux-gnu.tar.gz"
69+
sha256 = "ef8b27bf29747e71f33af408b4fe89ed2c605c8e9e242c006de8faac93c1c7be"
70+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.i686-linux-gnu.tar.gz"
8071
[[LibGit2]]
81-
arch = "i686"
82-
git-tree-sha1 = "31f31db60b5f31e9a0781b03be0f06656d19d41f"
83-
libc = "musl"
72+
arch = "aarch64"
73+
git-tree-sha1 = "792eb943913103eb5db9041cd1d0852109aee748"
74+
libc = "glibc"
8475
os = "linux"
8576

8677
[[LibGit2.download]]
87-
sha256 = "9fceb42d4ae26596154a3a7ba65e48a21115a42e90f45b50efcdee6e41a202e3"
88-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.i686-linux-musl.tar.gz"
78+
sha256 = "e15c01a64fe7768f914384f8933671808ff5e11d735c2c3acbd3e9fab39d798f"
79+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.aarch64-linux-gnu.tar.gz"
8980
[[LibGit2]]
90-
arch = "armv7l"
91-
git-tree-sha1 = "8678920cc83e4f024844376716105fc5ecbc0856"
81+
arch = "i686"
82+
git-tree-sha1 = "c0d576cb3dcf7081f07d3ba59f10d530a2d70b0b"
9283
libc = "musl"
9384
os = "linux"
9485

9586
[[LibGit2.download]]
96-
sha256 = "f983ebfde8034ab6c1d0df36ddb74d4db5d702786825c14e0dd22e070c37bfba"
97-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.arm-linux-musleabihf.tar.gz"
87+
sha256 = "1d506b76f932039f1627d9477e3e4a30a465f5ec7a68e869b5615f83d0fa64de"
88+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.i686-linux-musl.tar.gz"
9889
[[LibGit2]]
9990
arch = "x86_64"
100-
git-tree-sha1 = "f2a8d28291b8a0dd9c5d3240a9ad4da94fafaad2"
91+
git-tree-sha1 = "9d94051b4fc72a132da7eb106f7398e4067de468"
92+
os = "freebsd"
93+
94+
[[LibGit2.download]]
95+
sha256 = "0583602be1ee00a53009e20c99683ab22346e3a7c11c98e8f4b5548e2cc3b394"
96+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.x86_64-unknown-freebsd11.1.tar.gz"
97+
[[LibGit2]]
98+
arch = "i686"
99+
git-tree-sha1 = "9196faee913ef70a71dc8279c6c843bc733eb226"
101100
os = "windows"
102101

103102
[[LibGit2.download]]
104-
sha256 = "a2d73a9c5707fe17f215477e2e6c40e95697847c4c647aef2719bc1c0717fbc9"
105-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.x86_64-w64-mingw32.tar.gz"
103+
sha256 = "6c5562eaaab85a7c75f99f74ef55712016a2c2ef78bd929b2d702af64dada6af"
104+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.i686-w64-mingw32.tar.gz"
106105
[[LibGit2]]
107-
arch = "x86_64"
108-
git-tree-sha1 = "ddda01bbb4de3a31a07a29851d1d03087ac93d5f"
109-
os = "macos"
106+
arch = "armv7l"
107+
git-tree-sha1 = "8ef55e545f799e8f04c9274b00746b6e56c7fffe"
108+
libc = "musl"
109+
os = "linux"
110110

111111
[[LibGit2.download]]
112-
sha256 = "705aab5a292caffbcb0046a24f3192ae329a4658cf67f75de4d232f59d4f032b"
113-
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+0/LibGit2.v0.28.2.x86_64-apple-darwin14.tar.gz"
112+
sha256 = "5630f37ad27f1fd985f9ba509e61d715987d510807712229df02a401e2a94f7e"
113+
url = "https://github.com/JuliaBinaryWrappers/LibGit2_jll.jl/releases/download/LibGit2-v0.28.2+1/LibGit2.v0.28.2.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 = "LibGit2_jll"
22
uuid = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
3-
version = "0.28.2+0"
3+
version = "0.28.2+1"
44

55
[deps]
66
MbedTLS_jll = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
@@ -10,4 +10,4 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1010
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
1111

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

‎src/LibGit2_jll.jl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
11
module LibGit2_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 LibGit2_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: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ const libgit2 = "libgit2.so.28"
2727
Open all libraries
2828
"""
2929
function __init__()
30-
global prefix = abspath(joinpath(@__DIR__, ".."))
30+
global artifact_dir = abspath(artifact"LibGit2")
3131

3232
# Initialize PATH and LIBPATH environment variable listings
3333
global PATH_list, LIBPATH_list
34-
append!.(Ref(PATH_list), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
35-
append!.(Ref(LIBPATH_list), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
36-
37-
global libgit2_path = abspath(joinpath(artifact"LibGit2", libgit2_splitpath...))
34+
# We first need to add to LIBPATH_list the libraries provided by Julia
35+
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
36+
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
37+
# then append them to our own.
38+
foreach(p -> append!(PATH_list, p), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
39+
foreach(p -> append!(LIBPATH_list, p), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
40+
41+
global libgit2_path = normpath(joinpath(artifact_dir, libgit2_splitpath...))
3842

3943
# Manually `dlopen()` this right now so that future invocations
4044
# of `ccall` with its `SONAME` will find this path immediately.

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ const libgit2 = "libgit2.so.28"
2727
Open all libraries
2828
"""
2929
function __init__()
30-
global prefix = abspath(joinpath(@__DIR__, ".."))
30+
global artifact_dir = abspath(artifact"LibGit2")
3131

3232
# Initialize PATH and LIBPATH environment variable listings
3333
global PATH_list, LIBPATH_list
34-
append!.(Ref(PATH_list), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
35-
append!.(Ref(LIBPATH_list), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
36-
37-
global libgit2_path = abspath(joinpath(artifact"LibGit2", libgit2_splitpath...))
34+
# We first need to add to LIBPATH_list the libraries provided by Julia
35+
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
36+
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
37+
# then append them to our own.
38+
foreach(p -> append!(PATH_list, p), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
39+
foreach(p -> append!(LIBPATH_list, p), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
40+
41+
global libgit2_path = normpath(joinpath(artifact_dir, libgit2_splitpath...))
3842

3943
# Manually `dlopen()` this right now so that future invocations
4044
# of `ccall` with its `SONAME` will find this path immediately.

‎src/wrappers/arm-linux-gnueabihf.jl‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ const libgit2 = "libgit2.so.28"
2727
Open all libraries
2828
"""
2929
function __init__()
30-
global prefix = abspath(joinpath(@__DIR__, ".."))
30+
global artifact_dir = abspath(artifact"LibGit2")
3131

3232
# Initialize PATH and LIBPATH environment variable listings
3333
global PATH_list, LIBPATH_list
34-
append!.(Ref(PATH_list), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
35-
append!.(Ref(LIBPATH_list), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
36-
37-
global libgit2_path = abspath(joinpath(artifact"LibGit2", libgit2_splitpath...))
34+
# We first need to add to LIBPATH_list the libraries provided by Julia
35+
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
36+
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
37+
# then append them to our own.
38+
foreach(p -> append!(PATH_list, p), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
39+
foreach(p -> append!(LIBPATH_list, p), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
40+
41+
global libgit2_path = normpath(joinpath(artifact_dir, libgit2_splitpath...))
3842

3943
# Manually `dlopen()` this right now so that future invocations
4044
# of `ccall` with its `SONAME` will find this path immediately.

‎src/wrappers/arm-linux-musleabihf.jl‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ const libgit2 = "libgit2.so.28"
2727
Open all libraries
2828
"""
2929
function __init__()
30-
global prefix = abspath(joinpath(@__DIR__, ".."))
30+
global artifact_dir = abspath(artifact"LibGit2")
3131

3232
# Initialize PATH and LIBPATH environment variable listings
3333
global PATH_list, LIBPATH_list
34-
append!.(Ref(PATH_list), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
35-
append!.(Ref(LIBPATH_list), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
36-
37-
global libgit2_path = abspath(joinpath(artifact"LibGit2", libgit2_splitpath...))
34+
# We first need to add to LIBPATH_list the libraries provided by Julia
35+
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
36+
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
37+
# then append them to our own.
38+
foreach(p -> append!(PATH_list, p), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
39+
foreach(p -> append!(LIBPATH_list, p), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
40+
41+
global libgit2_path = normpath(joinpath(artifact_dir, libgit2_splitpath...))
3842

3943
# Manually `dlopen()` this right now so that future invocations
4044
# of `ccall` with its `SONAME` will find this path immediately.

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ const libgit2 = "libgit2.so.28"
2727
Open all libraries
2828
"""
2929
function __init__()
30-
global prefix = abspath(joinpath(@__DIR__, ".."))
30+
global artifact_dir = abspath(artifact"LibGit2")
3131

3232
# Initialize PATH and LIBPATH environment variable listings
3333
global PATH_list, LIBPATH_list
34-
append!.(Ref(PATH_list), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
35-
append!.(Ref(LIBPATH_list), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
36-
37-
global libgit2_path = abspath(joinpath(artifact"LibGit2", libgit2_splitpath...))
34+
# We first need to add to LIBPATH_list the libraries provided by Julia
35+
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
36+
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
37+
# then append them to our own.
38+
foreach(p -> append!(PATH_list, p), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
39+
foreach(p -> append!(LIBPATH_list, p), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
40+
41+
global libgit2_path = normpath(joinpath(artifact_dir, libgit2_splitpath...))
3842

3943
# Manually `dlopen()` this right now so that future invocations
4044
# of `ccall` with its `SONAME` will find this path immediately.

‎src/wrappers/i686-linux-musl.jl‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ const libgit2 = "libgit2.so.28"
2727
Open all libraries
2828
"""
2929
function __init__()
30-
global prefix = abspath(joinpath(@__DIR__, ".."))
30+
global artifact_dir = abspath(artifact"LibGit2")
3131

3232
# Initialize PATH and LIBPATH environment variable listings
3333
global PATH_list, LIBPATH_list
34-
append!.(Ref(PATH_list), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
35-
append!.(Ref(LIBPATH_list), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
36-
37-
global libgit2_path = abspath(joinpath(artifact"LibGit2", libgit2_splitpath...))
34+
# We first need to add to LIBPATH_list the libraries provided by Julia
35+
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
36+
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
37+
# then append them to our own.
38+
foreach(p -> append!(PATH_list, p), (MbedTLS_jll.PATH_list, LibSSH2_jll.PATH_list, LibCURL_jll.PATH_list,))
39+
foreach(p -> append!(LIBPATH_list, p), (MbedTLS_jll.LIBPATH_list, LibSSH2_jll.LIBPATH_list, LibCURL_jll.LIBPATH_list,))
40+
41+
global libgit2_path = normpath(joinpath(artifact_dir, libgit2_splitpath...))
3842

3943
# Manually `dlopen()` this right now so that future invocations
4044
# of `ccall` with its `SONAME` will find this path immediately.

0 commit comments

Comments
 (0)