From 89222061643e9dfe9c6f4e5a2bef250c90a508e9 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 8 Jun 2016 11:44:04 +0800 Subject: [PATCH] cmake: disable rocksdb from using jemalloc unless asked 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 --- src/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb2ff98f369..896d64b4fc4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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") -- 2.47.3