|
|
@ -1,17 +1,17 @@
|
|
|
|
From 5f427b0df0bebef259b1ab39e5b06eda38022b8b Mon Sep 17 00:00:00 2001
|
|
|
|
From 8a87f94f09c98f2c503da541239b819d2fe0178c Mon Sep 17 00:00:00 2001
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
From: Fabio Valentini <decathorpe@gmail.com>
|
|
|
|
Date: Sat, 16 Jul 2022 14:26:41 +0200
|
|
|
|
Date: Mon, 12 Dec 2022 23:28:52 +0100
|
|
|
|
Subject: [PATCH] build: unconditionally link against system liblzma
|
|
|
|
Subject: [PATCH] build: unconditionally link against system liblzma
|
|
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
---
|
|
|
|
build.rs | 103 ++-----------------------------------------------------
|
|
|
|
build.rs | 107 ++-----------------------------------------------------
|
|
|
|
1 file changed, 2 insertions(+), 101 deletions(-)
|
|
|
|
1 file changed, 2 insertions(+), 105 deletions(-)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
|
|
index 7d4c939..22ab405 100644
|
|
|
|
index 6bec545..22ab405 100644
|
|
|
|
--- a/build.rs
|
|
|
|
--- a/build.rs
|
|
|
|
+++ b/build.rs
|
|
|
|
+++ b/build.rs
|
|
|
|
@@ -1,104 +1,5 @@
|
|
|
|
@@ -1,108 +1,5 @@
|
|
|
|
-use std::env;
|
|
|
|
-use std::env;
|
|
|
|
-use std::fs;
|
|
|
|
-use std::fs;
|
|
|
|
-use std::path::PathBuf;
|
|
|
|
-use std::path::PathBuf;
|
|
|
@ -41,7 +41,7 @@ index 7d4c939..22ab405 100644
|
|
|
|
- let include_dir = env::current_dir().unwrap().join("xz-5.2/src/liblzma/api");
|
|
|
|
- let include_dir = env::current_dir().unwrap().join("xz-5.2/src/liblzma/api");
|
|
|
|
- println!("cargo:include={}", include_dir.display());
|
|
|
|
- println!("cargo:include={}", include_dir.display());
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- let src_files = [
|
|
|
|
- let mut src_files = [
|
|
|
|
- "xz-5.2/src/liblzma/common",
|
|
|
|
- "xz-5.2/src/liblzma/common",
|
|
|
|
- "xz-5.2/src/liblzma/lzma",
|
|
|
|
- "xz-5.2/src/liblzma/lzma",
|
|
|
|
- "xz-5.2/src/liblzma/lz",
|
|
|
|
- "xz-5.2/src/liblzma/lz",
|
|
|
@ -55,7 +55,11 @@ index 7d4c939..22ab405 100644
|
|
|
|
- .chain(vec![
|
|
|
|
- .chain(vec![
|
|
|
|
- "xz-5.2/src/common/tuklib_cpucores.c".into(),
|
|
|
|
- "xz-5.2/src/common/tuklib_cpucores.c".into(),
|
|
|
|
- "xz-5.2/src/common/tuklib_physmem.c".into(),
|
|
|
|
- "xz-5.2/src/common/tuklib_physmem.c".into(),
|
|
|
|
- ]);
|
|
|
|
- ])
|
|
|
|
|
|
|
|
- .collect::<Vec<_>>();
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
|
- // sort to make build reproducible.
|
|
|
|
|
|
|
|
- src_files.sort();
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- let mut build = cc::Build::new();
|
|
|
|
- let mut build = cc::Build::new();
|
|
|
|
-
|
|
|
|
-
|
|
|
@ -119,5 +123,5 @@ index 7d4c939..22ab405 100644
|
|
|
|
+ return;
|
|
|
|
+ return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
--
|
|
|
|
--
|
|
|
|
2.37.1
|
|
|
|
2.38.1
|
|
|
|
|
|
|
|
|
|
|
|