Skip to content

Commit 3b684c4

Browse files
committed
remove ippcp plugin for rocksdb
1 parent ce82c37 commit 3b684c4

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "ng-rocksdb"
33
description = "Rust wrapper for Facebook's RocksDB embeddable database, fork for Nextgraph.org"
4-
version = "0.21.0-ngpreview.5"
4+
version = "0.21.0-ngpreview.6"
55
edition = "2018"
66
rust-version = "1.60"
77
authors = ["Tyler Neely <t@jujit.su>", "David Greenberg <dsg123456789@gmail.com>"]

librocksdb-sys/build.rs

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -150,26 +150,27 @@ fn build_rocksdb() {
150150
// the flag has been moved to the darwin. openbsd, freebsd and linux cases below
151151
}
152152

153-
if target.contains("darwin") || (target.contains("linux") && !target.contains("android")) {
154-
// on macos and linux we use the IPPCP plugin of rocksdb for the crypto (the lib is precompiled)
155-
config.include("librocksdb-sys/rocksdb/plugin/ippcp/library/include");
156-
lib_sources.push("plugin/ippcp/ippcp_provider.cc");
157-
let dir = env::var("CARGO_MANIFEST_DIR").unwrap();
158-
let prebuild_lib = if target.contains("darwin") {
159-
"macos"
160-
} else {
161-
"linux"
162-
};
163-
println!(
164-
"cargo:rustc-link-search=native={}",
165-
Path::new(&dir)
166-
.join(format!(
167-
"librocksdb-sys/rocksdb/plugin/ippcp/library/{prebuild_lib}/lib"
168-
))
169-
.display()
170-
);
171-
println!("cargo:rustc-link-lib=static=ippcp");
172-
} else if !target.contains("openbsd") {
153+
// if target.contains("darwin") || (target.contains("linux") && !target.contains("android")) {
154+
// // on macos and linux we use the IPPCP plugin of rocksdb for the crypto (the lib is precompiled)
155+
// config.include("librocksdb-sys/rocksdb/plugin/ippcp/library/include");
156+
// lib_sources.push("plugin/ippcp/ippcp_provider.cc");
157+
// let dir = env::var("CARGO_MANIFEST_DIR").unwrap();
158+
// let prebuild_lib = if target.contains("darwin") {
159+
// "macos"
160+
// } else {
161+
// "linux"
162+
// };
163+
// println!(
164+
// "cargo:rustc-link-search=native={}",
165+
// Path::new(&dir)
166+
// .join(format!(
167+
// "librocksdb-sys/rocksdb/plugin/ippcp/library/{prebuild_lib}/lib"
168+
// ))
169+
// .display()
170+
// );
171+
// println!("cargo:rustc-link-lib=static=ippcp");
172+
// } else
173+
if !target.contains("openbsd") {
173174
if let Some(include) = std::env::var_os("DEP_OPENSSL_INCLUDE") {
174175
config.include(include);
175176
} else {

0 commit comments

Comments
 (0)