From 9c507333c53798eed4e2f736c21c3a3964d0755c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 8 Jun 2016 11:32:10 +0800 Subject: [PATCH] kv: explicitly set DISABLE_JEMALLOC for rocksdb in Makefile.am. we should disable rocksdb from using jemalloc even it is installed in the building host. as it causes unresolved symbols if ceph is not configured to use jemalloc and hence is not linked against it. we can pass "DISABLE_JEMALLOC=0" to rocksdb's Makefile in hope to enable jemalloc. because rocksdb checks for jemalloc using ``` ifndef DISABLE_JEMALLOC ``` Signed-off-by: Kefu Chai --- src/kv/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/kv/Makefile.am b/src/kv/Makefile.am index 5fcbe8012307c..789703472d9b4 100644 --- a/src/kv/Makefile.am +++ b/src/kv/Makefile.am @@ -26,14 +26,12 @@ NPROC = nproc endif # explicitly disable jemalloc unless we are using it. -if WITH_JEMALLOC -DISABLE_JEMALLOC = 0 -else -DISABLE_JEMALLOC = 1 +if !WITH_JEMALLOC +export DISABLE_JEMALLOC=1 endif rocksdb/librocksdb.a: - cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS="${ROCKSDBCXX_FLAGS}" PORTABLE=1 DISABLE_JEMALLOC="${DISABLE_JEMALLOC}" ${MAKE} -j$(shell ${NPROC}) static_lib + cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS="${ROCKSDBCXX_FLAGS}" PORTABLE=1 ${MAKE} -j$(shell ${NPROC}) static_lib libkv_a_CXXFLAGS += -I rocksdb/include -fPIC libkv_a_SOURCES += kv/RocksDBStore.cc libkv_a_LIBADD += rocksdb/librocksdb.a -- 2.39.5