remove ippcp plugin for rocksdb

master
Niko PLP 2 weeks ago
parent ce82c378b5
commit 3b684c4a9f
  1. 2
      Cargo.toml
  2. 41
      librocksdb-sys/build.rs

@ -1,7 +1,7 @@
[package] [package]
name = "ng-rocksdb" name = "ng-rocksdb"
description = "Rust wrapper for Facebook's RocksDB embeddable database, fork for Nextgraph.org" 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" edition = "2018"
rust-version = "1.60" rust-version = "1.60"
authors = ["Tyler Neely <t@jujit.su>", "David Greenberg <dsg123456789@gmail.com>"] authors = ["Tyler Neely <t@jujit.su>", "David Greenberg <dsg123456789@gmail.com>"]

@ -150,26 +150,27 @@ fn build_rocksdb() {
// the flag has been moved to the darwin. openbsd, freebsd and linux cases below // the flag has been moved to the darwin. openbsd, freebsd and linux cases below
} }
if target.contains("darwin") || (target.contains("linux") && !target.contains("android")) { // 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) // // 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"); // config.include("librocksdb-sys/rocksdb/plugin/ippcp/library/include");
lib_sources.push("plugin/ippcp/ippcp_provider.cc"); // lib_sources.push("plugin/ippcp/ippcp_provider.cc");
let dir = env::var("CARGO_MANIFEST_DIR").unwrap(); // let dir = env::var("CARGO_MANIFEST_DIR").unwrap();
let prebuild_lib = if target.contains("darwin") { // let prebuild_lib = if target.contains("darwin") {
"macos" // "macos"
} else { // } else {
"linux" // "linux"
}; // };
println!( // println!(
"cargo:rustc-link-search=native={}", // "cargo:rustc-link-search=native={}",
Path::new(&dir) // Path::new(&dir)
.join(format!( // .join(format!(
"librocksdb-sys/rocksdb/plugin/ippcp/library/{prebuild_lib}/lib" // "librocksdb-sys/rocksdb/plugin/ippcp/library/{prebuild_lib}/lib"
)) // ))
.display() // .display()
); // );
println!("cargo:rustc-link-lib=static=ippcp"); // println!("cargo:rustc-link-lib=static=ippcp");
} else if !target.contains("openbsd") { // } else
if !target.contains("openbsd") {
if let Some(include) = std::env::var_os("DEP_OPENSSL_INCLUDE") { if let Some(include) = std::env::var_os("DEP_OPENSSL_INCLUDE") {
config.include(include); config.include(include);
} else { } else {

Loading…
Cancel
Save