chore: don't use vcpkg for building dependencies.

VirusTotal · Mar 13, 2024 · 3c31922 · 3c31922
1 parent 5966f6e
commit 3c31922
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/capi/Cargo.toml b/capi/Cargo.toml
@@ -18,5 +18,4 @@ crate-type = ["staticlib", "cdylib"]
 yara-x = { workspace = true }
 
 [build-dependencies]
-cbindgen = { workspace = true }
-vcpkg = { workspace = true }
+cbindgen = { workspace = true }
diff --git a/capi/build.rs b/capi/build.rs
@@ -1,5 +1,4 @@
 use std::env;
-use vcpkg;
 
 fn main() {
     println!("cargo:rerun-if-changed=src");
@@ -8,10 +7,6 @@ fn main() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
     let output_file = "include/yara-x.h".to_owned();
 
-    vcpkg::find_package("libmagic").unwrap();
-    vcpkg::find_package("bzip2").unwrap();
-    vcpkg::find_package("zlib").unwrap();
-
     match cbindgen::generate(crate_dir) {
         Ok(header) => {
             header.write_to_file(output_file);

diff --git a/cli/build.rs b/cli/build.rs
diff --git a/lib/Cargo.toml b/lib/Cargo.toml
@@ -220,10 +220,4 @@ zip = "0.6.6"
 
 [[bench]]
 name = "benches"
-harness = false
-
-
-[package.metadata.vcpkg]
-git = "https://github.com/microsoft/vcpkg"
-rev = "fba75d0"
-dependencies = ["bzip2", "zlib"]
+harness = false
diff --git a/py/Cargo.toml b/py/Cargo.toml
@@ -21,5 +21,4 @@ yara-x = { workspace = true }
 vcpkg = "0.2.15"
 
 [build-dependencies]
-pyo3-build-config = "0.19.2"
-vcpkg = { workspace = true }
+pyo3-build-config = "0.19.2"
diff --git a/py/build.rs b/py/build.rs
@@ -1,7 +1,3 @@
 fn main() {
-    vcpkg::find_package("libmagic").unwrap();
-    vcpkg::find_package("bzip2").unwrap();
-    vcpkg::find_package("zlib").unwrap();
-
     pyo3_build_config::add_extension_module_link_args();
 }