Skip to content

Commit e4a68ca

Browse files
authored
Update BinaryBuilderBase in the manifest (#983)
1 parent 124bd71 commit e4a68ca

File tree

2 files changed

+38
-42
lines changed

2 files changed

+38
-42
lines changed

Manifest.toml

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
[[ArgParse]]
44
deps = ["Logging", "TextWrap"]
5-
git-tree-sha1 = "a8fc2e149cd6db276c76faebe197ccd3a92fb9ff"
5+
git-tree-sha1 = "4a8f4df432fd8e8a96a142c53f9432b9022a92e6"
66
uuid = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
7-
version = "1.1.0"
7+
version = "1.1.1"
88

99
[[ArgTools]]
1010
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
@@ -28,7 +28,7 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
2828

2929
[[BinaryBuilderBase]]
3030
deps = ["CodecZlib", "Downloads", "InteractiveUtils", "JSON", "LibGit2", "Libdl", "Logging", "OutputCollectors", "Pkg", "Random", "SHA", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll"]
31-
git-tree-sha1 = "670fa00c09d08e4d78dd592cdfdf440161d5d951"
31+
git-tree-sha1 = "a4b358c4bafcf19a216946276a6ca1a4cd832a4d"
3232
repo-rev = "master"
3333
repo-url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"
3434
uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
@@ -70,9 +70,9 @@ uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
7070

7171
[[FileIO]]
7272
deps = ["Pkg"]
73-
git-tree-sha1 = "cad2e71389ecb2f4480e0de74faab04af13d7929"
73+
git-tree-sha1 = "fee8955b9dfa7bec67117ef48085fb2b559b9c22"
7474
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
75-
version = "1.4.4"
75+
version = "1.4.5"
7676

7777
[[FileWatching]]
7878
uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
@@ -84,10 +84,10 @@ uuid = "8f6bce27-0656-5410-875b-07a5572985df"
8484
version = "0.1.6"
8585

8686
[[GitHub]]
87-
deps = ["Base64", "Dates", "HTTP", "JSON", "MbedTLS", "Sockets"]
88-
git-tree-sha1 = "599dec6adb9f1b73b9c31c9cd4302a01d2575d81"
87+
deps = ["Base64", "Dates", "HTTP", "JSON", "MbedTLS", "Sockets", "SodiumSeal"]
88+
git-tree-sha1 = "a4f61fc1b1724e6eec1d9333eac2d4b01d8fcc8f"
8989
uuid = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"
90-
version = "5.2.0"
90+
version = "5.4.0"
9191

9292
[[HTTP]]
9393
deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
@@ -123,9 +123,9 @@ uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
123123
version = "0.1.14"
124124

125125
[[JLLWrappers]]
126-
git-tree-sha1 = "c70593677bbf2c3ccab4f7500d0f4dacfff7b75c"
126+
git-tree-sha1 = "04b49c556240b62d5a799e94c63d5fc14d3c07cd"
127127
uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
128-
version = "1.1.3"
128+
version = "1.1.4"
129129

130130
[[JSON]]
131131
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
@@ -139,12 +139,6 @@ git-tree-sha1 = "66397cc6c08922f98a28ab05a8d3002f9853b129"
139139
uuid = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
140140
version = "0.3.2"
141141

142-
[[Lazy]]
143-
deps = ["MacroTools"]
144-
git-tree-sha1 = "1370f8202dac30758f3c345f9909b97f53d87d3f"
145-
uuid = "50d2b5c4-7a5e-59d5-8109-a42b560f39c0"
146-
version = "0.15.1"
147-
148142
[[LibCURL]]
149143
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
150144
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
@@ -191,9 +185,9 @@ version = "1.0.3"
191185

192186
[[MbedTLS_jll]]
193187
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
194-
git-tree-sha1 = "47e19f64fc939b86dea2b9b5e38c29c787f0d581"
188+
git-tree-sha1 = "bf50d4a1911612ee8f662d0038fc05dda1bea57d"
195189
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
196-
version = "2.24.0+1"
190+
version = "2.25.0+0"
197191

198192
[[Mmap]]
199193
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
@@ -203,15 +197,15 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
203197

204198
[[Mustache]]
205199
deps = ["Printf", "Tables"]
206-
git-tree-sha1 = "f5d718790ff475b5b8ab9c1599ed105f0f24f253"
200+
git-tree-sha1 = "36995ef0d532fe08119d70b2365b7b03d4e00f48"
207201
uuid = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70"
208-
version = "1.0.8"
202+
version = "1.0.10"
209203

210204
[[Mux]]
211-
deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "Lazy", "Pkg", "Sockets", "WebSockets"]
212-
git-tree-sha1 = "8e917fbe96da22628feae3f01b4f100e709ab746"
205+
deps = ["AssetRegistry", "Base64", "HTTP", "Hiccup", "Pkg", "Sockets", "WebSockets"]
206+
git-tree-sha1 = "2578b3cd03e4f568f213c7d51b2118f9e81c2617"
213207
uuid = "a975b10e-0019-58db-a62f-e48ff68538c9"
214-
version = "0.7.3"
208+
version = "0.7.5"
215209

216210
[[ObjectFile]]
217211
deps = ["Reexport", "StructIO", "Test"]
@@ -231,9 +225,9 @@ version = "0.1.0"
231225

232226
[[Parsers]]
233227
deps = ["Dates"]
234-
git-tree-sha1 = "b417be52e8be24e916e34b3d70ec2da7bdf56a68"
228+
git-tree-sha1 = "50c9a9ed8c714945e01cd53a21007ed3865ed714"
235229
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
236-
version = "1.0.12"
230+
version = "1.0.15"
237231

238232
[[Pidfile]]
239233
deps = ["FileWatching", "Test"]
@@ -257,9 +251,9 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
257251

258252
[[ProgressMeter]]
259253
deps = ["Distributed", "Printf"]
260-
git-tree-sha1 = "4cff8da83f89e06eeae5b81307a08bb33a96a602"
254+
git-tree-sha1 = "45640774ee2efa24e52686dbdf895e88102e68fc"
261255
uuid = "92933f4c-e287-5a05-a399-4b506db050ca"
262-
version = "1.4.0"
256+
version = "1.4.1"
263257

264258
[[REPL]]
265259
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
@@ -301,6 +295,12 @@ version = "1.1.0"
301295
[[Sockets]]
302296
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
303297

298+
[[SodiumSeal]]
299+
deps = ["Base64", "Libdl", "libsodium_jll"]
300+
git-tree-sha1 = "80cef67d2953e33935b41c6ab0a178b9987b1c99"
301+
uuid = "2133526b-2bfb-4018-ac12-889fb3908a75"
302+
version = "0.1.1"
303+
304304
[[StructIO]]
305305
deps = ["Test"]
306306
git-tree-sha1 = "010dc73c7146869c042b49adcdb6bf528c12e859"
@@ -319,9 +319,9 @@ version = "1.0.0"
319319

320320
[[Tables]]
321321
deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]
322-
git-tree-sha1 = "5131a624173d532299d1c7eb05341c18112b21b8"
322+
git-tree-sha1 = "240d19b8762006ff04b967bdd833269ad642d550"
323323
uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
324-
version = "1.2.1"
324+
version = "1.2.2"
325325

326326
[[Tar]]
327327
deps = ["ArgTools", "SHA"]
@@ -356,10 +356,10 @@ uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
356356
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
357357

358358
[[WebSockets]]
359-
deps = ["Base64", "Dates", "Distributed", "HTTP", "Logging", "Random", "Sockets", "Test"]
360-
git-tree-sha1 = "13f763d38c7a05688938808b49cb29b18b60c8c8"
359+
deps = ["Base64", "Dates", "HTTP", "Logging", "Sockets"]
360+
git-tree-sha1 = "a07c280e068acb96a7aeb0a6d35c801ba526e364"
361361
uuid = "104b5d7c-a370-577a-8038-80a2059c5097"
362-
version = "1.5.2"
362+
version = "1.5.7"
363363

364364
[[ZMQ]]
365365
deps = ["FileWatching", "Sockets", "ZeroMQ_jll"]
@@ -385,6 +385,12 @@ git-tree-sha1 = "f5c8cb306d4fe2d1fff90443a088fc5ba536c134"
385385
uuid = "07c12ed4-43bc-5495-8a2a-d5838ef8d533"
386386
version = "0.13.0+1"
387387

388+
[[libsodium_jll]]
389+
deps = ["Libdl", "Pkg"]
390+
git-tree-sha1 = "7127f5f40332ccfa43ee07dcd0c4d81a27d9bb23"
391+
uuid = "a9144af2-ca23-56d9-984f-0d03f7b5ccf8"
392+
version = "1.0.18+1"
393+
388394
[[p7zip_jll]]
389395
deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
390396
git-tree-sha1 = "4b909fd780b3711197e3faa806dd631bdc5af510"

docs/src/troubleshooting.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,6 @@ The build environment provided by `BinaryBuilder` is a `x86_64-linux-musl`, and
8787

8888
This is one of worst cases when cross-compiling, and there isn't a simple solution. You have to look into the build process to see if running the executable can be skipped (see for example the patch to not run `dot` in [#351](https://github.com/JuliaPackaging/Yggdrasil/pull/351)), or replaced by something else. If the executable is a compile-time only utility, try to build it with the native compiler (see for example the patch to build a native `mkdefs` in [#351](https://github.com/JuliaPackaging/Yggdrasil/pull/351))
8989

90-
### Multiple library names for different platforms
91-
Since some projects use different libnames for different platforms, when passing multiple libnames to `LibraryProduct`, you can use `parse_dl_name_version` to query the libname, for example:
92-
93-
```
94-
julia> using Base.BinaryPlatforms
95-
96-
julia> parse_dl_name_version("sfml-audio-2.dll", "windows")[1]
97-
"sfml-audio"
98-
```
99-
10090
## PowerPC Linux
10191

10292
### Shared library not built

0 commit comments

Comments
 (0)