]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: disable rocksdb from using jemalloc unless asked 9573/head
authorKefu Chai <kchai@redhat.com>
Wed, 8 Jun 2016 03:44:04 +0000 (11:44 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 8 Jun 2016 04:06:31 +0000 (12:06 +0800)
rocksdb detects used libraries by itself. it we don't disable it
explicitly, it will pull in unresolved symbols at ceph's link
time. so we disable it unless jemalloc is enabled at configure-time.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/CMakeLists.txt

index cb2ff98f3699231b3da084493b1c20e07478d5b7..896d64b4fc498f6e946e81332481ee6b59189a10 100644 (file)
@@ -834,9 +834,12 @@ if(WITH_SPDK)
 endif(WITH_SPDK)
 
 # make rocksdb statically
+if(NOT ALLOCATOR STREQUAL "jemalloc")
+  set(disable_jemalloc "DISABLE_JEMALLOC=1")
+endif()
 add_custom_target(build_rocksdb
     COMMAND
-    PORTABLE=1 $(MAKE) static_lib EXTRA_CXXFLAGS='-fPIC -Wno-unused-variable'
+    PORTABLE=1 ${disable_jemalloc} $(MAKE) static_lib EXTRA_CXXFLAGS='-fPIC -Wno-unused-variable'
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/rocksdb
     COMMENT "rocksdb building")