From a9b2e2b0f041ad5aca00d15f4159d2a82b5d6cd3 Mon Sep 17 00:00:00 2001
From: Ofek Lev <ofekmeister@gmail.com>
Date: Sun, 12 May 2024 16:53:15 -0400
Subject: [PATCH] Remove newly-introduced dependence on CMake (#128)

---
 Cargo.lock | 20 --------------------
 Cargo.toml | 15 +++++----------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b49d58d..6562438 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -255,15 +255,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
-[[package]]
-name = "cmake"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "colorchoice"
 version = "1.0.1"
@@ -454,7 +445,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
- "libz-ng-sys",
  "miniz_oxide",
 ]
 
@@ -799,16 +789,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "libz-ng-sys"
-version = "1.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5"
-dependencies = [
- "cmake",
- "libc",
-]
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.13"
diff --git a/Cargo.toml b/Cargo.toml
index 1858532..c7a5522 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,6 +21,9 @@ os_pipe = "1.1.4"
 reqwest = { version = "0.12", features = ["blocking", "rustls-tls"], default-features = false }
 tar = "0.4.38"
 tempfile = "3.5.0"
+# Remove dependence on CMake by avoiding libz-ng-sys, see:
+# https://github.com/rust-lang/libz-sys/pull/174
+zip = { version = "1.2.3", features = ["aes-crypto", "bzip2", "deflate", "deflate64", "deflate-zopfli", "lzma", "time", "zstd"], default-features = false }
 zstd = "0.13.0"
 
 [build-dependencies]
@@ -31,16 +34,8 @@ rand = "0.8.5"
 regex = "1.8.1"
 reqwest = { version = "0.12", features = ["blocking", "rustls-tls"], default-features = false }
 tar = "0.4.38"
-
-# Avoid libz-ng-sys on PowerPC https://github.com/rust-lang/libz-sys/issues/183#issuecomment-2106318961
-[target.'cfg(not(target_arch = "powerpc64"))'.dependencies]
-zip = "1.2.3"
-[target.'cfg(not(target_arch = "powerpc64"))'.build-dependencies]
-zip = "1.2.3"
-
-[target.'cfg(target_arch = "powerpc64")'.dependencies]
-zip = { version = "1.2.3", features = ["aes-crypto", "bzip2", "deflate", "deflate64", "deflate-zopfli", "lzma", "time", "zstd"], default-features = false }
-[target.'cfg(target_arch = "powerpc64")'.build-dependencies]
+# Remove dependence on CMake by avoiding libz-ng-sys, see:
+# https://github.com/rust-lang/libz-sys/pull/174
 zip = { version = "1.2.3", features = ["aes-crypto", "bzip2", "deflate", "deflate64", "deflate-zopfli", "lzma", "time", "zstd"], default-features = false }
 
 [profile.release]