Skip to content

Commit e2f53b4

Browse files
jlbuildjlbuild
committed
LibArchive_jll build 3.4.3+1
1 parent 4259fec commit e2f53b4

16 files changed

+141
-174
lines changed

‎Artifacts.toml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,113 @@
11
[[LibArchive]]
22
arch = "aarch64"
3-
git-tree-sha1 = "32092d4f1b0e7aa9a7ccff76ca3cfe8e6d9491a5"
3+
git-tree-sha1 = "bbdbed49024ec8a2a4ae24d336c8ee5c10ef2670"
44
libc = "glibc"
55
os = "linux"
66

77
[[LibArchive.download]]
8-
sha256 = "aea99de3a5a2c625a70ef5561c6dfb766ec6284c718460febc4b131ea42e0a95"
9-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.aarch64-linux-gnu.tar.gz"
8+
sha256 = "c2ca2c69dfb22dbeb6e2c7b362b473ff61c95856fc84609802b2deee072dc718"
9+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.aarch64-linux-gnu.tar.gz"
1010
[[LibArchive]]
1111
arch = "aarch64"
12-
git-tree-sha1 = "7fe112e329a6e3cb557929527cbe34e9535f87a9"
12+
git-tree-sha1 = "f269b2f7028af796fd902b18dd046dd0cb040176"
1313
libc = "musl"
1414
os = "linux"
1515

1616
[[LibArchive.download]]
17-
sha256 = "a2b354f0f00ef2d5416330bcad9a9b76a8c60552917165de86decd69abee0e93"
18-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.aarch64-linux-musl.tar.gz"
17+
sha256 = "fa6a01195b2d6073da6e1b4cf89817fdbfe888e31575e50a0f4d739b2871ff44"
18+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.aarch64-linux-musl.tar.gz"
1919
[[LibArchive]]
2020
arch = "armv7l"
21-
git-tree-sha1 = "d2d0a78f6b04ccd8d9bce443b54fd986d9b9f367"
21+
git-tree-sha1 = "0d1fe8057530b5413a279a50f2e29678f45a8551"
2222
libc = "glibc"
2323
os = "linux"
2424

2525
[[LibArchive.download]]
26-
sha256 = "dd311f81d226557e59be505afc36dfceaa3b906d4fd85b1105e0b9a801deac06"
27-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.armv7l-linux-gnueabihf.tar.gz"
26+
sha256 = "9eca5eab4adfd3549e8e6ba18c15d18560ba58692d00689ab026dda5beb30207"
27+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.armv7l-linux-gnueabihf.tar.gz"
2828
[[LibArchive]]
2929
arch = "armv7l"
30-
git-tree-sha1 = "e1a62da29db40e54eddfcfae86d0fc18d4127037"
30+
git-tree-sha1 = "70a07e2f17ff6aadd47ddf52c2276a2f37b44516"
3131
libc = "musl"
3232
os = "linux"
3333

3434
[[LibArchive.download]]
35-
sha256 = "35dd3fea297c91c3481aedfef9500db4e902a5a9379537b6210f004f7847a93d"
36-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.armv7l-linux-musleabihf.tar.gz"
35+
sha256 = "c45c104a839452c5a65da13bdca959ad84cbe861f11cd17939916a0afa929e40"
36+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.armv7l-linux-musleabihf.tar.gz"
3737
[[LibArchive]]
3838
arch = "i686"
39-
git-tree-sha1 = "c5bd0dfe66d51c12ee46ede47e64a39c50cea324"
39+
git-tree-sha1 = "f510f41c6908204c6443371addbc01fb3aac4da3"
4040
libc = "glibc"
4141
os = "linux"
4242

4343
[[LibArchive.download]]
44-
sha256 = "6f7c87b5e73e7ea14205674e2b1c3d553fba4dc6f4f74c4b8cbb89627fb91533"
45-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.i686-linux-gnu.tar.gz"
44+
sha256 = "e83adc550742cb0b65bd8923eca6e5932d042f72ee91f6ceeaaa0fbc1c1b7b50"
45+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.i686-linux-gnu.tar.gz"
4646
[[LibArchive]]
4747
arch = "i686"
48-
git-tree-sha1 = "8f9671452a50ec6c8aedebe1cf13988c605014b5"
48+
git-tree-sha1 = "b73c491635cab58edd2a4fbee3c7c59a9d6e3d79"
4949
libc = "musl"
5050
os = "linux"
5151

5252
[[LibArchive.download]]
53-
sha256 = "f2d77d6c29ef91de350b4c450e33817f6dc865edc5480bcd05b56fcb9a91c717"
54-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.i686-linux-musl.tar.gz"
53+
sha256 = "62e7eefe9832fd8105600ebe288627132307c89a348a2f26dbec1bf38d98ad9a"
54+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.i686-linux-musl.tar.gz"
5555
[[LibArchive]]
5656
arch = "i686"
57-
git-tree-sha1 = "ae4b57fdf0a2be93be56cc349d0ffc9f43496006"
57+
git-tree-sha1 = "707ef630d4d1150e7ca1b957171dba5e928cd06c"
5858
os = "windows"
5959

6060
[[LibArchive.download]]
61-
sha256 = "89af5c6ea91d64f2f7f8d30aaaf7c9c098f437469b48dc156a38a5d73fc7c882"
62-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.i686-w64-mingw32.tar.gz"
61+
sha256 = "5bff42429e277d0cdf6426e7f0eaad3f33869a482cd93e33c4917850f69820ce"
62+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.i686-w64-mingw32.tar.gz"
6363
[[LibArchive]]
6464
arch = "powerpc64le"
65-
git-tree-sha1 = "bfd1e2e97436e79acf5c68fb778d16eca12a292b"
65+
git-tree-sha1 = "7680fef6a854739fa6ebfe5747d057d01248005b"
6666
libc = "glibc"
6767
os = "linux"
6868

6969
[[LibArchive.download]]
70-
sha256 = "a6402ce76e111f3617a860d2b116ec3707cdb6e0f1a9858ebb2dc479d3cafa9c"
71-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.powerpc64le-linux-gnu.tar.gz"
70+
sha256 = "12052c9ea3d7deb5d96627a99697a1f061ae2f0c5d4979c0d2982989c2cab09e"
71+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.powerpc64le-linux-gnu.tar.gz"
7272
[[LibArchive]]
7373
arch = "x86_64"
74-
git-tree-sha1 = "a72ba465cf739ac68828aa93c28ed76ffebbf9c5"
74+
git-tree-sha1 = "ba034a5c3d0363149008455edbdf78ce2f57ab34"
7575
os = "macos"
7676

7777
[[LibArchive.download]]
78-
sha256 = "09c0c0b0c74be2f1db13f2c0498b0b3e250f226317e74d9fa4d0c5c68df47c4a"
79-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.x86_64-apple-darwin14.tar.gz"
78+
sha256 = "9ed88b559ff52fd8a37526e6539ecbb7a3732945ab797096c216eeb95253e280"
79+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.x86_64-apple-darwin14.tar.gz"
8080
[[LibArchive]]
8181
arch = "x86_64"
82-
git-tree-sha1 = "084857aba3fcf08ddd8ea02f0f2f3c5ec60d9bfe"
82+
git-tree-sha1 = "0e3fbaf84107212037141140a34178ec25e5b09b"
8383
libc = "glibc"
8484
os = "linux"
8585

8686
[[LibArchive.download]]
87-
sha256 = "5fad2e943cd240ffa20d8f38f5e03512234c4506df6617352867207117b6b46c"
88-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.x86_64-linux-gnu.tar.gz"
87+
sha256 = "c1590ac10c593b33a18d3efd443efd2240307f2c5fac478a0efa79b55bef54ee"
88+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.x86_64-linux-gnu.tar.gz"
8989
[[LibArchive]]
9090
arch = "x86_64"
91-
git-tree-sha1 = "601be60ef4007151b2b900b3006df441382d4112"
91+
git-tree-sha1 = "f5ac7c977d20727fed3a23134b57d8dc1b41aef9"
9292
libc = "musl"
9393
os = "linux"
9494

9595
[[LibArchive.download]]
96-
sha256 = "e6e212891308684c1814ad51ec95e403047c01adda42232047c21bbe89929f02"
97-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.x86_64-linux-musl.tar.gz"
96+
sha256 = "fe0e2151d041d5790e613b9915e4a10343b24f63804ea6686db1a043b38d83e3"
97+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.x86_64-linux-musl.tar.gz"
9898
[[LibArchive]]
9999
arch = "x86_64"
100-
git-tree-sha1 = "c4d4ad6b56df829e8ebc1a5cf50d1117f12fad07"
100+
git-tree-sha1 = "ecdf78b1b9f2728fe568a30e8f419562a41c5ffa"
101101
os = "freebsd"
102102

103103
[[LibArchive.download]]
104-
sha256 = "6952687ada78d411eb690744c1358fc340b4c538aea9fc1ed7be6aace4a6f9b8"
105-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.x86_64-unknown-freebsd11.1.tar.gz"
104+
sha256 = "72165d31af8f076a01e81a33ae760677a841fa64bd4e23ec1b870c7a33d4f06f"
105+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.x86_64-unknown-freebsd11.1.tar.gz"
106106
[[LibArchive]]
107107
arch = "x86_64"
108-
git-tree-sha1 = "a9bf5b31614cc9e9dd2a1a8044deba739a6ebe0e"
108+
git-tree-sha1 = "0c891a4e57910da7d6f4110a52438dd11f87634a"
109109
os = "windows"
110110

111111
[[LibArchive.download]]
112-
sha256 = "b9d2bbd50961973d5f53e7d4cc93357e188b06cc8cdfc2b0dded027c6fd66db5"
113-
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+0/LibArchive.v3.4.3.x86_64-w64-mingw32.tar.gz"
112+
sha256 = "b2a77c3bb314d1202cccea16c2bba012ce8c21a4499b6c0751b20b46736325c7"
113+
url = "https://github.com/JuliaBinaryWrappers/LibArchive_jll.jl/releases/download/LibArchive-v3.4.3+1/LibArchive.v3.4.3.x86_64-w64-mingw32.tar.gz"

‎Project.toml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
name = "LibArchive_jll"
22
uuid = "1e303b3e-d4db-56ce-88c4-91e52606a1a8"
3-
version = "3.4.3+0"
3+
version = "3.4.3+1"
44

55
[deps]
66
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
7-
Bzip2_jll = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
87
Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a"
98
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
109
Lz4_jll = "5ced341a-0733-55b8-9ab6-a4889d929147"
10+
Attr_jll = "1fd713ca-387f-5abc-8002-d8b8b1623b73"
11+
Bzip2_jll = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
12+
acl_jll = "ed5aba05-e74d-5cf7-8b09-107ba3463b8e"
13+
OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
14+
XZ_jll = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
1115
Expat_jll = "2e619515-83b5-522b-bb60-26c02a35a201"
1216
Libiconv_jll = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
13-
XZ_jll = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
1417
Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
1518

1619
[compat]

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# `LibArchive_jll.jl` (v3.4.3+0)
1+
# `LibArchive_jll.jl` (v3.4.3+1)
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/48160b4254209a905e0319fcf119fa38b2ca36aa/L/LibArchive/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/c5f16934e30e033b7e24dcccd5ede9d9095fbb19/L/LibArchive/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
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

@@ -32,13 +32,16 @@ The tarballs for `LibArchive_jll.jl` have been built from these sources:
3232

3333
The following JLL packages are required by `LibArchive_jll.jl`:
3434

35+
* [`Attr_jll`](https://github.com/JuliaBinaryWrappers/Attr_jll.jl)
3536
* [`Bzip2_jll`](https://github.com/JuliaBinaryWrappers/Bzip2_jll.jl)
3637
* [`Expat_jll`](https://github.com/JuliaBinaryWrappers/Expat_jll.jl)
3738
* [`Libiconv_jll`](https://github.com/JuliaBinaryWrappers/Libiconv_jll.jl)
3839
* [`Lz4_jll`](https://github.com/JuliaBinaryWrappers/Lz4_jll.jl)
40+
* [`OpenSSL_jll`](https://github.com/JuliaBinaryWrappers/OpenSSL_jll.jl)
3941
* [`XZ_jll`](https://github.com/JuliaBinaryWrappers/XZ_jll.jl)
4042
* [`Zlib_jll`](https://github.com/JuliaBinaryWrappers/Zlib_jll.jl)
4143
* [`Zstd_jll`](https://github.com/JuliaBinaryWrappers/Zstd_jll.jl)
44+
* [`acl_jll`](https://github.com/JuliaBinaryWrappers/acl_jll.jl)
4245

4346
## Products
4447

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# Autogenerated wrapper script for LibArchive_jll for aarch64-linux-gnu
22
export bsdcat, bsdcpio, bsdtar, libarchive
33

4+
using acl_jll
5+
using Attr_jll
46
using Bzip2_jll
57
using Expat_jll
68
using Libiconv_jll
79
using Lz4_jll
10+
using OpenSSL_jll
811
using XZ_jll
912
using Zlib_jll
1013
using Zstd_jll
@@ -131,11 +134,9 @@ function __init__()
131134
global PATH_list, LIBPATH_list
132135
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
133136
# then append them to our own.
134-
foreach(p -> append!(PATH_list, p), (Bzip2_jll.PATH_list, Expat_jll.PATH_list, Libiconv_jll.PATH_list, Lz4_jll.PATH_list, XZ_jll.PATH_list, Zlib_jll.PATH_list, Zstd_jll.PATH_list,))
135-
foreach(p -> append!(LIBPATH_list, p), (Bzip2_jll.LIBPATH_list, Expat_jll.LIBPATH_list, Libiconv_jll.LIBPATH_list, Lz4_jll.LIBPATH_list, XZ_jll.LIBPATH_list, Zlib_jll.LIBPATH_list, Zstd_jll.LIBPATH_list,))
137+
foreach(p -> append!(PATH_list, p), (acl_jll.PATH_list, Attr_jll.PATH_list, Bzip2_jll.PATH_list, Expat_jll.PATH_list, Libiconv_jll.PATH_list, Lz4_jll.PATH_list, OpenSSL_jll.PATH_list, XZ_jll.PATH_list, Zlib_jll.PATH_list, Zstd_jll.PATH_list,))
138+
foreach(p -> append!(LIBPATH_list, p), (acl_jll.LIBPATH_list, Attr_jll.LIBPATH_list, Bzip2_jll.LIBPATH_list, Expat_jll.LIBPATH_list, Libiconv_jll.LIBPATH_list, Lz4_jll.LIBPATH_list, OpenSSL_jll.LIBPATH_list, XZ_jll.LIBPATH_list, Zlib_jll.LIBPATH_list, Zstd_jll.LIBPATH_list,))
136139

137-
# Lastly, we need to add to LIBPATH_list the libraries provided by Julia
138-
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
139140
global bsdcat_path = normpath(joinpath(artifact_dir, bsdcat_splitpath...))
140141

141142
push!(PATH_list, dirname(bsdcat_path))
@@ -156,12 +157,8 @@ function __init__()
156157
filter!(!isempty, unique!(PATH_list))
157158
filter!(!isempty, unique!(LIBPATH_list))
158159
global PATH = join(PATH_list, ':')
159-
global LIBPATH = join(LIBPATH_list, ':')
160+
global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')
160161

161-
# Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms
162-
# that don't honor our "already opened" trick)
163-
#for lp in LIBPATH_list
164-
# push!(DL_LOAD_PATH, lp)
165-
#end
162+
166163
end # __init__()
167164

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# Autogenerated wrapper script for LibArchive_jll for aarch64-linux-musl
22
export bsdcat, bsdcpio, bsdtar, libarchive
33

4+
using acl_jll
5+
using Attr_jll
46
using Bzip2_jll
57
using Expat_jll
68
using Libiconv_jll
79
using Lz4_jll
10+
using OpenSSL_jll
811
using XZ_jll
912
using Zlib_jll
1013
using Zstd_jll
@@ -131,11 +134,9 @@ function __init__()
131134
global PATH_list, LIBPATH_list
132135
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
133136
# then append them to our own.
134-
foreach(p -> append!(PATH_list, p), (Bzip2_jll.PATH_list, Expat_jll.PATH_list, Libiconv_jll.PATH_list, Lz4_jll.PATH_list, XZ_jll.PATH_list, Zlib_jll.PATH_list, Zstd_jll.PATH_list,))
135-
foreach(p -> append!(LIBPATH_list, p), (Bzip2_jll.LIBPATH_list, Expat_jll.LIBPATH_list, Libiconv_jll.LIBPATH_list, Lz4_jll.LIBPATH_list, XZ_jll.LIBPATH_list, Zlib_jll.LIBPATH_list, Zstd_jll.LIBPATH_list,))
137+
foreach(p -> append!(PATH_list, p), (acl_jll.PATH_list, Attr_jll.PATH_list, Bzip2_jll.PATH_list, Expat_jll.PATH_list, Libiconv_jll.PATH_list, Lz4_jll.PATH_list, OpenSSL_jll.PATH_list, XZ_jll.PATH_list, Zlib_jll.PATH_list, Zstd_jll.PATH_list,))
138+
foreach(p -> append!(LIBPATH_list, p), (acl_jll.LIBPATH_list, Attr_jll.LIBPATH_list, Bzip2_jll.LIBPATH_list, Expat_jll.LIBPATH_list, Libiconv_jll.LIBPATH_list, Lz4_jll.LIBPATH_list, OpenSSL_jll.LIBPATH_list, XZ_jll.LIBPATH_list, Zlib_jll.LIBPATH_list, Zstd_jll.LIBPATH_list,))
136139

137-
# Lastly, we need to add to LIBPATH_list the libraries provided by Julia
138-
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
139140
global bsdcat_path = normpath(joinpath(artifact_dir, bsdcat_splitpath...))
140141

141142
push!(PATH_list, dirname(bsdcat_path))
@@ -156,12 +157,8 @@ function __init__()
156157
filter!(!isempty, unique!(PATH_list))
157158
filter!(!isempty, unique!(LIBPATH_list))
158159
global PATH = join(PATH_list, ':')
159-
global LIBPATH = join(LIBPATH_list, ':')
160+
global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')
160161

161-
# Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms
162-
# that don't honor our "already opened" trick)
163-
#for lp in LIBPATH_list
164-
# push!(DL_LOAD_PATH, lp)
165-
#end
162+
166163
end # __init__()
167164

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
# Autogenerated wrapper script for LibArchive_jll for armv7l-linux-gnueabihf
22
export bsdcat, bsdcpio, bsdtar, libarchive
33

4+
using acl_jll
5+
using Attr_jll
46
using Bzip2_jll
57
using Expat_jll
68
using Libiconv_jll
79
using Lz4_jll
10+
using OpenSSL_jll
811
using XZ_jll
912
using Zlib_jll
1013
using Zstd_jll
@@ -131,11 +134,9 @@ function __init__()
131134
global PATH_list, LIBPATH_list
132135
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
133136
# then append them to our own.
134-
foreach(p -> append!(PATH_list, p), (Bzip2_jll.PATH_list, Expat_jll.PATH_list, Libiconv_jll.PATH_list, Lz4_jll.PATH_list, XZ_jll.PATH_list, Zlib_jll.PATH_list, Zstd_jll.PATH_list,))
135-
foreach(p -> append!(LIBPATH_list, p), (Bzip2_jll.LIBPATH_list, Expat_jll.LIBPATH_list, Libiconv_jll.LIBPATH_list, Lz4_jll.LIBPATH_list, XZ_jll.LIBPATH_list, Zlib_jll.LIBPATH_list, Zstd_jll.LIBPATH_list,))
137+
foreach(p -> append!(PATH_list, p), (acl_jll.PATH_list, Attr_jll.PATH_list, Bzip2_jll.PATH_list, Expat_jll.PATH_list, Libiconv_jll.PATH_list, Lz4_jll.PATH_list, OpenSSL_jll.PATH_list, XZ_jll.PATH_list, Zlib_jll.PATH_list, Zstd_jll.PATH_list,))
138+
foreach(p -> append!(LIBPATH_list, p), (acl_jll.LIBPATH_list, Attr_jll.LIBPATH_list, Bzip2_jll.LIBPATH_list, Expat_jll.LIBPATH_list, Libiconv_jll.LIBPATH_list, Lz4_jll.LIBPATH_list, OpenSSL_jll.LIBPATH_list, XZ_jll.LIBPATH_list, Zlib_jll.LIBPATH_list, Zstd_jll.LIBPATH_list,))
136139

137-
# Lastly, we need to add to LIBPATH_list the libraries provided by Julia
138-
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
139140
global bsdcat_path = normpath(joinpath(artifact_dir, bsdcat_splitpath...))
140141

141142
push!(PATH_list, dirname(bsdcat_path))
@@ -156,12 +157,8 @@ function __init__()
156157
filter!(!isempty, unique!(PATH_list))
157158
filter!(!isempty, unique!(LIBPATH_list))
158159
global PATH = join(PATH_list, ':')
159-
global LIBPATH = join(LIBPATH_list, ':')
160+
global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')
160161

161-
# Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms
162-
# that don't honor our "already opened" trick)
163-
#for lp in LIBPATH_list
164-
# push!(DL_LOAD_PATH, lp)
165-
#end
162+
166163
end # __init__()
167164

0 commit comments

Comments
 (0)