Skip to content

Commit 29bd0a4

Browse files
authored
Fix musl compilation (#234)
musl (which we already use in ruff) allows statically linked binaries on linux. This PR switches to rustls and vendors and fixes the glibc detection. Using static musl builds makes it easier to avoid glibc errors in docker and we'll need it later for alpine users anyway. An alternative is using vendored openssl.
1 parent d47dc64 commit 29bd0a4

File tree

7 files changed

+279
-264
lines changed

7 files changed

+279
-264
lines changed

Diff for: Cargo.lock

+84-130
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pyproject-toml = { version = "0.7.0" }
4646
rayon = { version = "1.8.0" }
4747
reflink-copy = { version = "0.1.10" }
4848
regex = { version = "1.9.6" }
49-
reqwest = { version = "0.11.22", features = ["json", "gzip", "brotli", "stream"] }
49+
reqwest = { version = "0.11.22", default-features = false, features = ["json", "gzip", "brotli", "stream", "rustls-tls"] }
5050
reqwest-middleware = { version = "0.2.3" }
5151
reqwest-retry = { version = "0.3.0" }
5252
rfc2047-decoder = { version = "1.0.1" }

Diff for: crates/gourgeist/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ clap = { workspace = true }
2424
configparser = { workspace = true }
2525
dirs = { workspace = true }
2626
fs-err = { workspace = true }
27-
reqwest = { workspace = true, optional = true, features = ["blocking"] }
27+
reqwest = { workspace = true, optional = true, default-features = false, features = ["blocking"] }
2828
rayon = { workspace = true, optional = true }
2929
serde = { workspace = true }
3030
serde_json = { workspace = true }

Diff for: crates/platform-host/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ license = { workspace = true }
1111

1212
[dependencies]
1313
fs-err = { workspace = true }
14-
glibc_version = { workspace = true }
1514
goblin = { workspace = true }
1615
platform-info = { workspace = true }
1716
plist = { workspace = true }
1817
regex = { workspace = true }
19-
serde = { workspace = true }
18+
serde = { workspace = true, features = ["derive"] }
2019
target-lexicon = { workspace = true }
2120
thiserror = { workspace = true }
2221
tracing = { workspace = true }

0 commit comments

Comments
 (0)