From adda7bb0a4c5c137bbe093120f402f31b1cb5fb4 Mon Sep 17 00:00:00 2001 From: Miles Granger Date: Tue, 24 Sep 2024 11:07:04 +0200 Subject: [PATCH] fix build maybe --- Cargo.toml | 14 +++++++------- src/experimental.rs | 5 ++++- src/lib.rs | 5 ++++- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5f2ba9cf..96662128 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,11 +28,11 @@ xz = ["xz-static"] xz-static = ["libcramjam/xz-static"] xz-shared = ["libcramjam/xz-shared"] -igzip = ["isal-static"] -isal-static = ["libcramjam/isal-static"] -isal-shared = ["libcramjam/isal-shared"] -use-system-isal-static = ["libcramjam/use-system-isal", "libcramjam/isal-static"] -use-system-isal-shared = ["libcramjam/use-system-isal", "libcramjam/isal-shared"] +igzip = ["igzip-static"] +igzip-static = ["libcramjam/igzip-static"] +igzip-shared = ["libcramjam/igzip-shared"] +use-system-isal-static = ["libcramjam/use-system-isal", "libcramjam/igzip-static"] +use-system-isal-shared = ["libcramjam/use-system-isal", "libcramjam/igzip-shared"] gzip = ["gzip-static"] gzip-static = ["libcramjam/gzip-static"] @@ -54,8 +54,8 @@ wasm32-compat = ["libcramjam/wasm32-compat"] [dependencies] pyo3 = { version = "^0.22", default-features = false, features = ["macros"] } # libcramjam = { version = "0.5.0", default-features = false } -# libcramjam = { git = "https://github.com/cramjam/libcramjam.git", branch = "bump-isal", default-features = false } -libcramjam = { path = "../libcramjam", default-features = false } +libcramjam = { git = "https://github.com/cramjam/libcramjam.git", branch = "bump-isal", default-features = false } +# libcramjam = { path = "../libcramjam", default-features = false } [build-dependencies] pyo3-build-config = "^0.22" diff --git a/src/experimental.rs b/src/experimental.rs index 2888160f..998d81ee 100644 --- a/src/experimental.rs +++ b/src/experimental.rs @@ -13,7 +13,10 @@ pub mod experimental { #[pymodule_export] use crate::blosc2::blosc2; - #[cfg(all(feature = "igzip", target_pointer_width = "64"))] + #[cfg(all( + any(feature = "igzip", feature = "igzip-static", feature = "igzip-shared"), + target_pointer_width = "64" + ))] #[pymodule_export] use crate::igzip::igzip; } diff --git a/src/lib.rs b/src/lib.rs index 30f57621..27eba0f1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -65,7 +65,10 @@ pub mod bzip2; pub mod deflate; #[cfg(any(feature = "gzip", feature = "gzip-static", feature = "gzip-shared"))] pub mod gzip; -#[cfg(all(feature = "igzip", target_pointer_width = "64"))] +#[cfg(all( + any(feature = "igzip", feature = "igzip-static", feature = "igzip-shared"), + target_pointer_width = "64" +))] pub mod igzip; #[cfg(feature = "lz4")] pub mod lz4;