From 3b684c4a9f9f426bb4848f94641e60c58a465a30 Mon Sep 17 00:00:00 2001 From: Niko PLP Date: Fri, 22 Nov 2024 09:34:02 +0200 Subject: [PATCH] remove ippcp plugin for rocksdb --- Cargo.toml | 2 +- librocksdb-sys/build.rs | 41 +++++++++++++++++++++-------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8f9f13e..9a19cf6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "ng-rocksdb" description = "Rust wrapper for Facebook's RocksDB embeddable database, fork for Nextgraph.org" -version = "0.21.0-ngpreview.5" +version = "0.21.0-ngpreview.6" edition = "2018" rust-version = "1.60" authors = ["Tyler Neely ", "David Greenberg "] diff --git a/librocksdb-sys/build.rs b/librocksdb-sys/build.rs index 0633a34..7762e59 100644 --- a/librocksdb-sys/build.rs +++ b/librocksdb-sys/build.rs @@ -150,26 +150,27 @@ fn build_rocksdb() { // the flag has been moved to the darwin. openbsd, freebsd and linux cases below } - if target.contains("darwin") || (target.contains("linux") && !target.contains("android")) { - // on macos and linux we use the IPPCP plugin of rocksdb for the crypto (the lib is precompiled) - config.include("librocksdb-sys/rocksdb/plugin/ippcp/library/include"); - lib_sources.push("plugin/ippcp/ippcp_provider.cc"); - let dir = env::var("CARGO_MANIFEST_DIR").unwrap(); - let prebuild_lib = if target.contains("darwin") { - "macos" - } else { - "linux" - }; - println!( - "cargo:rustc-link-search=native={}", - Path::new(&dir) - .join(format!( - "librocksdb-sys/rocksdb/plugin/ippcp/library/{prebuild_lib}/lib" - )) - .display() - ); - println!("cargo:rustc-link-lib=static=ippcp"); - } else if !target.contains("openbsd") { + // if target.contains("darwin") || (target.contains("linux") && !target.contains("android")) { + // // on macos and linux we use the IPPCP plugin of rocksdb for the crypto (the lib is precompiled) + // config.include("librocksdb-sys/rocksdb/plugin/ippcp/library/include"); + // lib_sources.push("plugin/ippcp/ippcp_provider.cc"); + // let dir = env::var("CARGO_MANIFEST_DIR").unwrap(); + // let prebuild_lib = if target.contains("darwin") { + // "macos" + // } else { + // "linux" + // }; + // println!( + // "cargo:rustc-link-search=native={}", + // Path::new(&dir) + // .join(format!( + // "librocksdb-sys/rocksdb/plugin/ippcp/library/{prebuild_lib}/lib" + // )) + // .display() + // ); + // println!("cargo:rustc-link-lib=static=ippcp"); + // } else + if !target.contains("openbsd") { if let Some(include) = std::env::var_os("DEP_OPENSSL_INCLUDE") { config.include(include); } else {