More flags from c-blosc2 and build wasm32 emscripten (#30)

* Propagate flags from c-blosc2 - wasm32-emscripten CI job
* Add deactivate-zlib-optim for wasm32 compat
* Use forked wasm32 support branch
* CI updates
* Use c-blosc2 git tip f8723dc w/ wasm32 support

Blosc/c-blosc2@f8723dc

.github/workflows/CI.yml

@@ -93,6 +93,28 @@ jobs:
       - name: Test
         run: cross test --target ${{ matrix.target }} --no-default-features --features static --release
 
+  test-wasm32-emscripten:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        build: [static, shared]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          target: wasm32-unknown-emscripten
+
+      - name: Install Emscripten
+        uses: mymindstorm/setup-emsdk@v14
+
+      - name: Build
+        run: cargo build --target wasm32-unknown-emscripten --no-default-features --features deactivate-zlib-optim --features ${{ matrix.build }}
+
   test-native:
     runs-on: ${{ matrix.os }}
     strategy:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "blosc2-rs"
-version = "0.3.0+2.15.1"
+version = "0.3.1+2.15.1"
 description = "Blosc2"
 license = "MIT"
 edition = "2021"
@@ -11,13 +11,19 @@ name = "blosc2"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
 default = ["shared"]
-use-system-blosc2 = ["blosc2-sys/use-system-blosc2"]
-regenerate-bindings = ["blosc2-sys/regenerate-bindings"]
-static = ["blosc2-sys/static"]
-shared = ["blosc2-sys/shared"]
+use-system-blosc2     = ["blosc2-sys/use-system-blosc2"]
+regenerate-bindings   = ["blosc2-sys/regenerate-bindings"]
+static                = ["blosc2-sys/static"]
+shared                = ["blosc2-sys/shared"]
+deactivate-zlib       = ["blosc2-sys/deactivate-zlib"]
+prefer-external-zlib  = ["blosc2-sys/prefer-external-zlib"]
+deactivate-zstd       = ["blosc2-sys/deactivate-zstd"]
+prefer-external-zstd  = ["blosc2-sys/prefer-external-zstd"]
+prefer-external-lz4   = ["blosc2-sys/prefer-external-lz4"]
+deactivate-zlib-optim = ["blosc2-sys/deactivate-zlib-optim"]
 
 [dependencies]
-blosc2-sys = { path = "blosc2-sys", version = "0.3.0+2.15.1" }
+blosc2-sys = { path = "blosc2-sys", version = "0.3.1+2.15.1" }
 parking_lot = "^0.12"
 
 [dev-dependencies]

blosc2-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "blosc2-sys"
-version = "0.3.0+2.15.1"
+version = "0.3.1+2.15.1"
 edition = "2021"
 description = "Bindings to C Blosc2"
 license = "MIT"
@@ -22,11 +22,21 @@ libc = "^0.2"
 
 [features]
 default = []
-static = []
-shared = []
-use-system-blosc2 = ["dep:pkg-config"]
+static  = []
+shared  = []
 
-# Regenerate the bindings to c-blosc2 header, will require bindgen crate
+use-system-blosc2     = ["dep:pkg-config"]
+deactivate-zlib-optim = []
+
+deactivate-zlib       = []
+prefer-external-zlib  = []
+
+deactivate-zstd       = []
+prefer-external-zstd  = []
+
+prefer-external-lz4   = []
+
+# Regenerate the bindings to c-blosc2 header
 regenerate-bindings = ["bindgen"]
 
 [build-dependencies]

blosc2-sys/build.rs

@@ -6,7 +6,7 @@ use std::path::PathBuf;
 const VENDORED_BLOSC2_VERSION: &'static str = "2.15.1";
 
 fn main() {
-    println!("cargo::rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-changed=build.rs");
 
     // build blosc2 from source
     #[cfg(not(feature = "use-system-blosc2"))]
@@ -41,6 +41,24 @@ fn main() {
             .define("CMAKE_C_FLAGS", cmake_c_flags)
             .always_configure(true);
 
+        if cfg!(feature = "deactivate-zlib-optim") {
+            cmake_conf.define("WITH_ZLIB_OPTIM", "OFF");
+        }
+        if cfg!(feature = "deactivate-zlib") {
+            cmake_conf.define("DEACTIVATE_ZLIB", "ON");
+        }
+        if cfg!(feature = "prefer-external-zlib") {
+            cmake_conf.define("PREFER_EXTERNAL_ZLIB", "ON");
+        }
+        if cfg!(feature = "deactivate-zstd") {
+            cmake_conf.define("DEACTIVATE_ZSTD", "ON");
+        }
+        if cfg!(feature = "prefer-external-zstd") {
+            cmake_conf.define("PREFER_EXTERNAL_ZSTD", "ON");
+        }
+        if cfg!(feature = "prefer-external-lz4") {
+            cmake_conf.define("PREFER_EXTERNAL_LZ4", "ON");
+        }
         if cfg!(feature = "static") {
             cmake_conf.define("BUILD_STATIC", "ON");
         }