From cb7696dadcc4daec36b0bdb8c1ccb7560c0329c0 Mon Sep 17 00:00:00 2001 From: Leon Tan Date: Tue, 22 Oct 2024 15:09:10 +0000 Subject: [PATCH] Reintroduce `zlib-ng` in build-dependencies --- Cargo.lock | 20 ++++++++++++++++++++ src/dfx/Cargo.toml | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 178ec84455..0da609f011 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1006,6 +1006,15 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +[[package]] +name = "cmake" +version = "0.1.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +dependencies = [ + "cc", +] + [[package]] name = "codespan-reporting" version = "0.11.1" @@ -2053,6 +2062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", + "libz-ng-sys", "miniz_oxide", ] @@ -3916,6 +3926,16 @@ dependencies = [ "libc", ] +[[package]] +name = "libz-ng-sys" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4436751a01da56f1277f323c80d584ffad94a3d14aecd959dd0dff75aa73a438" +dependencies = [ + "cmake", + "libc", +] + [[package]] name = "link-cplusplus" version = "1.0.9" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 284d59c345..3fd8b6aeb8 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -15,7 +15,9 @@ path = "src/main.rs" [build-dependencies] backoff = { version = "0.4.0", features = ["futures", "tokio"] } bytes = "1" -flate2 = { version = "1.0.11" } +flate2 = { version = "1.0.11", default-features = false, features = [ + "zlib-ng", +] } hex = "0.4.3" reqwest.workspace = true serde = { version = "1.0", features = ["derive"] }