projects/aports·blob master · refs

52 lines · 1.5 KiB

1From: Jakub Jirutka <[email protected]>
2Date: Sat, 20 Aug 2022 00:09:00 +0200
3Subject: [PATCH] Build with native zlib-ng (no compat)
4
5Use zlib-ng (libz-ng-sys) with native API (no compat mode) that can
6co-exist with system libz (loaded by e.g. libcurl).
7
8--- a/git-features/Cargo.toml
9+++ b/git-features/Cargo.toml
10@@ -46,2 +46,4 @@
11 zlib-rust-backend = ["flate2/rust_backend"]
12+## Use zlib-ng (libz-ng-sys) with native API (no compat mode) that can co-exist with system libz.
13+zlib-ng = ["flate2/zlib-ng"]
14
15--- a/git-repository/Cargo.toml
16+++ b/git-repository/Cargo.toml
17@@ -66,3 +66,2 @@
18 "git-features/parallel",
19- "git-features/zlib-ng-compat",
20 "git-pack/pack-cache-lru-static",
21--- a/Cargo.toml
22+++ b/Cargo.toml
23@@ -33 +33 @@
24-fast = ["git-features/parallel", "git-features/fast-sha1", "git-features/zlib-ng-compat", "git-repository/max-performance"]
25+fast = ["git-features/parallel", "git-features/fast-sha1", "git-features/zlib-ng", "git-repository/max-performance"]
26--- a/Cargo.lock
27+++ b/Cargo.lock
28@@ -911,6 +911,7 @@
29 checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
30 dependencies = [
31 "crc32fast",
32+ "libz-ng-sys",
33 "libz-sys",
34 "miniz_oxide",
35 ]
36@@ -2005,6 +2006,16 @@
37 "openssl-sys",
38 "pkg-config",
39 "vcpkg",
40+]
41+
42+[[package]]
43+name = "libz-ng-sys"
44+version = "1.1.8"
45+source = "registry+https://github.com/rust-lang/crates.io-index"
46+checksum = "4399ae96a9966bf581e726de86969f803a81b7ce795fcd5480e640589457e0f2"
47+dependencies = [
48+ "cmake",
49+ "libc",
50 ]
51
52 [[package]]