diff --git a/Cargo.toml b/Cargo.toml index 905414b3..aa42594b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,11 +44,9 @@ url = "2.1" valgrind_request = { version = "1.1", optional = true } walkdir = "2" xdg = "2.2" -zstd = "0.4" +zstd = { version = "0.4", features = [ "bindgen" ] } +zstd-sys = { version = "*", features = [ "pkg-config" ], default-features = false } [features] default = [] valgrind = ["valgrind_request"] - -[replace] -"zstd-sys:1.4.13" = { path = "zstd-sys" } diff --git a/zstd-sys/Cargo.toml b/zstd-sys/Cargo.toml deleted file mode 100644 index 067c8ace..00000000 --- a/zstd-sys/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -edition = "2018" -name = "zstd-sys" -version = "1.4.13" -authors = [ - "Wolfgang Bumiller ", -] - -[build-dependencies] -bindgen = ">0.42.2" - -[features] -default = ["legacy"] -legacy = [] -experimental = [] diff --git a/zstd-sys/build.rs b/zstd-sys/build.rs deleted file mode 100644 index f945ccf2..00000000 --- a/zstd-sys/build.rs +++ /dev/null @@ -1,27 +0,0 @@ -extern crate bindgen; - -use std::env; -use std::path::PathBuf; - -fn main() { - // Tell cargo to tell rustc to link the system libzstd - println!("cargo:rustc-link-lib=zstd"); - - // The bindgen::Builder is the main entry point - // to bindgen, and lets you build up options for - // the resulting bindings. - let bindings = bindgen::Builder::default() - .header("wrapper.h") - .blacklist_type("max_align_t") - .use_core() - .rustified_enum(".*") - .clang_arg("-DZSTD_STATIC_LINKING_ONLY") - .generate() - .expect("Unable to generate bindings"); - - // Write the bindings to the $OUT_DIR/bindings.rs file. - let out_path = PathBuf::from(env::var("OUT_DIR").unwrap()); - bindings - .write_to_file(out_path.join("bindings.rs")) - .expect("Couldn't write bindings!"); -} diff --git a/zstd-sys/src/lib.rs b/zstd-sys/src/lib.rs deleted file mode 100644 index a38a13a8..00000000 --- a/zstd-sys/src/lib.rs +++ /dev/null @@ -1,5 +0,0 @@ -#![allow(non_upper_case_globals)] -#![allow(non_camel_case_types)] -#![allow(non_snake_case)] - -include!(concat!(env!("OUT_DIR"), "/bindings.rs")); diff --git a/zstd-sys/wrapper.h b/zstd-sys/wrapper.h deleted file mode 100644 index 6e07bad8..00000000 --- a/zstd-sys/wrapper.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#include