Merge pull request #140 from spacejam/tyler_fix_build_warnings

fix build warnings, bump rocksdb to 5.6.2
master
Tyler Neely 7 years ago committed by GitHub
commit 57fe05e027
  1. 4
      .travis.yml
  2. 5
      CHANGELOG.txt
  3. 4
      Cargo.toml
  4. 2
      librocksdb-sys/Cargo.toml
  5. 27
      librocksdb-sys/build.rs
  6. 2
      librocksdb-sys/rocksdb

@ -17,6 +17,4 @@ script:
- cargo test --manifest-path=librocksdb-sys/Cargo.toml - cargo test --manifest-path=librocksdb-sys/Cargo.toml
- cargo test - cargo test
cache: cache: cargo
directories:
- $HOME/.cache/

@ -1,6 +1,11 @@
Changelog Changelog
========= =========
0.7.2 (2017-09-02)
~~~~~~~~~~~~~~~~~~~~
* Bumped rocksdb to 5.6.2 (spacejam)
0.7.1 (2017-08-29) 0.7.1 (2017-08-29)
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
* Bumped rocksdb to 5.6.1 (vmx) * Bumped rocksdb to 5.6.1 (vmx)

@ -1,7 +1,7 @@
[package] [package]
name = "rocksdb" name = "rocksdb"
description = "Rust wrapper for Facebook's RocksDB embeddable database" description = "Rust wrapper for Facebook's RocksDB embeddable database"
version = "0.7.1" version = "0.7.2"
authors = ["Tyler Neely <t@jujit.su>", "David Greenberg <dsg123456789@gmail.com>"] authors = ["Tyler Neely <t@jujit.su>", "David Greenberg <dsg123456789@gmail.com>"]
license = "Apache-2.0" license = "Apache-2.0"
keywords = ["database", "embedded", "LSM-tree", "persistence"] keywords = ["database", "embedded", "LSM-tree", "persistence"]
@ -19,4 +19,4 @@ valgrind = []
[dependencies] [dependencies]
libc = "0.2" libc = "0.2"
librocksdb-sys = { path = "librocksdb-sys", version = "5.6.1" } librocksdb-sys = { path = "librocksdb-sys", version = "5.6.2" }

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

@ -17,7 +17,10 @@ fn link(name: &str, bundled: bool) {
fn fail_on_empty_directory(name: &str) { fn fail_on_empty_directory(name: &str) {
if fs::read_dir(name).unwrap().count() == 0 { if fs::read_dir(name).unwrap().count() == 0 {
println!("The `{}` directory is empty, did you forget to pull the submodules?", name); println!(
"The `{}` directory is empty, did you forget to pull the submodules?",
name
);
println!("Try `git submodule update --init --recursive`"); println!("Try `git submodule update --init --recursive`");
panic!(); panic!();
} }
@ -42,7 +45,8 @@ fn build_rocksdb() {
.collect::<Vec<&'static str>>(); .collect::<Vec<&'static str>>();
// We have a pregenerated a version of build_version.cc in the local directory // We have a pregenerated a version of build_version.cc in the local directory
lib_sources = lib_sources.iter() lib_sources = lib_sources
.iter()
.cloned() .cloned()
.filter(|file| *file != "util/build_version.cc") .filter(|file| *file != "util/build_version.cc")
.collect::<Vec<&'static str>>(); .collect::<Vec<&'static str>>();
@ -70,15 +74,14 @@ fn build_rocksdb() {
config.define("OS_WIN", Some("1")); config.define("OS_WIN", Some("1"));
// Remove POSIX-specific sources // Remove POSIX-specific sources
lib_sources = lib_sources.iter() lib_sources = lib_sources
.iter()
.cloned() .cloned()
.filter(|file| { .filter(|file| match *file {
match *file { "port/port_posix.cc" |
"port/port_posix.cc" | "util/env_posix.cc" |
"util/env_posix.cc" | "util/io_posix.cc" => false,
"util/io_posix.cc" => false, _ => true,
_ => true,
}
}) })
.collect::<Vec<&'static str>>(); .collect::<Vec<&'static str>>();
@ -96,6 +99,10 @@ fn build_rocksdb() {
config.flag("-std=c++11"); 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 { for file in lib_sources {
let file = "rocksdb/".to_string() + file; let file = "rocksdb/".to_string() + file;
config.file(&file); config.file(&file);

@ -1 +1 @@
Subproject commit 20d49e4b9bace859fcdb5c87b37db2cdb2c6013a Subproject commit bbd65abcfc156a4777d10250601761691e2fcef3
Loading…
Cancel
Save