|
|
|
@ -1,15 +1,15 @@
|
|
|
|
|
From 2c6e27c3723ccb3c83e28a0b6c2033564f9f515e Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 68404dcb073c4d9f5e7a515dcda38554dcc1b011 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
|
Date: Tue, 1 Aug 2023 15:13:34 +0200
|
|
|
|
|
Date: Sun, 7 Jul 2024 15:18:13 +0200
|
|
|
|
|
Subject: [PATCH] unconditionally use bindgen and pkg-config to link against
|
|
|
|
|
system libzstd
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
build.rs | 211 +------------------------------------------------------
|
|
|
|
|
1 file changed, 3 insertions(+), 208 deletions(-)
|
|
|
|
|
build.rs | 210 +------------------------------------------------------
|
|
|
|
|
1 file changed, 3 insertions(+), 207 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
|
index c7b52f5..2274c45 100644
|
|
|
|
|
index e03f354..2274c45 100644
|
|
|
|
|
--- a/build.rs
|
|
|
|
|
+++ b/build.rs
|
|
|
|
|
@@ -1,8 +1,6 @@
|
|
|
|
@ -65,7 +65,7 @@ index c7b52f5..2274c45 100644
|
|
|
|
|
/// This function would find the first flag in `flags` that is supported
|
|
|
|
|
/// and add that to `config`.
|
|
|
|
|
#[allow(dead_code)]
|
|
|
|
|
@@ -86,157 +56,6 @@ fn flag_if_supported_with_fallbacks(config: &mut cc::Build, flags: &[&str]) {
|
|
|
|
|
@@ -86,156 +56,6 @@ fn flag_if_supported_with_fallbacks(config: &mut cc::Build, flags: &[&str]) {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -126,7 +126,6 @@ index c7b52f5..2274c45 100644
|
|
|
|
|
- cargo_print(&"rerun-if-changed=wasm-shim/string.h");
|
|
|
|
|
-
|
|
|
|
|
- config.include("wasm-shim/");
|
|
|
|
|
- config.define("XXH_STATIC_ASSERT", Some("0"));
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- // Some extra parameters
|
|
|
|
@ -223,7 +222,7 @@ index c7b52f5..2274c45 100644
|
|
|
|
|
/// Print a line for cargo.
|
|
|
|
|
///
|
|
|
|
|
/// If non-cargo is set, do not print anything.
|
|
|
|
|
@@ -249,32 +68,8 @@ fn cargo_print(content: &dyn fmt::Display) {
|
|
|
|
|
@@ -248,32 +68,8 @@ fn cargo_print(content: &dyn fmt::Display) {
|
|
|
|
|
fn main() {
|
|
|
|
|
cargo_print(&"rerun-if-env-changed=ZSTD_SYS_USE_PKG_CONFIG");
|
|
|
|
|
|
|
|
|
@ -258,5 +257,5 @@ index c7b52f5..2274c45 100644
|
|
|
|
|
let includes: Vec<_> = headerpaths
|
|
|
|
|
.iter()
|
|
|
|
|
--
|
|
|
|
|
2.44.0
|
|
|
|
|
2.45.2
|
|
|
|
|
|
|
|
|
|