rocksdb: sync with upstream

and update the CMakeLists.txt accordingly, as upstream changed the
target name to build the static library.

5647d5e reverted the previous change by accident.

Fixes: http://tracker.ceph.com/issues/18464
Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5565268ba94c3562a1dc6e65cd828f04ebabeea9..101b3f632b6b5c8f85dd4bfabfa316148ea61aaa 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -758,7 +758,7 @@ if (NOT WITH_SYSTEM_ROCKSDB)
     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb
     CMAKE_ARGS ${ROCKSDB_CMAKE_ARGS}
     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/rocksdb
-    BUILD_COMMAND $(MAKE) rocksdblib
+    BUILD_COMMAND $(MAKE) rocksdb
     INSTALL_COMMAND "true")
 
   # force rocksdb make to be called on each time
@@ -772,7 +772,7 @@ if (NOT WITH_SYSTEM_ROCKSDB)
 
   add_library(rocksdb STATIC IMPORTED)
   add_dependencies(rocksdb rocksdb_ext)
-  set_property(TARGET rocksdb PROPERTY IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/rocksdb/librocksdblib.a")
+  set_property(TARGET rocksdb PROPERTY IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/rocksdb/librocksdb.a")
   set(ROCKSDB_LIBRARIES rocksdb)
 
 endif(NOT WITH_SYSTEM_ROCKSDB)

diff --git a/src/rocksdb b/src/rocksdb
index a0deec960f3a8190831c673e5ba998fe6fb7ea90..3b4ac8076bff9fd6a8b4ccbc37a1995d08981840 160000 (submodule)
--- a/src/rocksdb
+++ b/src/rocksdb
@@ -1 +1 @@
-Subproject commit a0deec960f3a8190831c673e5ba998fe6fb7ea90
+Subproject commit 3b4ac8076bff9fd6a8b4ccbc37a1995d08981840