Merge pull request #153 from jquesnelle/windows-build

fix windows build (bump rocksdb to 5.7.1)
master
Tyler Neely 7 years ago committed by GitHub
commit 4280b2c71e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      Cargo.toml
  2. 2
      librocksdb-sys/Cargo.toml
  3. 7
      librocksdb-sys/build.rs
  4. 2
      librocksdb-sys/rocksdb
  5. 2
      librocksdb-sys/rocksdb_lib_sources.txt

@ -19,4 +19,4 @@ valgrind = []
[dependencies]
libc = "0.2"
librocksdb-sys = { path = "librocksdb-sys", version = "5.6.2" }
librocksdb-sys = { path = "librocksdb-sys", version = "5.7.1" }

@ -1,6 +1,6 @@
[package]
name = "librocksdb-sys"
version = "5.6.2"
version = "5.7.1"
authors = ["Karl Hobley <karlhobley10@gmail.com>", "Arkadiy Paronyan <arkadiy@ethcore.io>"]
license = "MIT/Apache-2.0/BSD-3-Clause"
description = "Native bindings to librocksdb"

@ -94,8 +94,8 @@ fn build_rocksdb() {
.cloned()
.filter(|file| match *file {
"port/port_posix.cc" |
"util/env_posix.cc" |
"util/io_posix.cc" => false,
"env/env_posix.cc" |
"env/io_posix.cc" => false,
_ => true,
})
.collect::<Vec<&'static str>>();
@ -112,11 +112,10 @@ fn build_rocksdb() {
config.flag("-EHsc");
} else {
config.flag("-std=c++11");
}
// this was breaking the build on travis due to
// > 4mb of warnings emitted.
config.flag("-Wno-unused-parameter");
}
for file in lib_sources {
let file = "rocksdb/".to_string() + file;

@ -1 +1 @@
Subproject commit bbd65abcfc156a4777d10250601761691e2fcef3
Subproject commit acf935e40f9d6f4c3d13c7d310def7064c1f1c95

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save