From: Mark Nelson <mnelson@redhat.com>
Date: Tue, 7 Jun 2016 16:27:17 +0000 (-0500)
Subject: explicitly set JEMALLOC for rocksdb.
X-Git-Tag: v11.0.0~281^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c8bff9ad34a408d9bd4cb7807f1f0eae634436e2;p=ceph.git

explicitly set JEMALLOC for rocksdb.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
---

diff --git a/src/kv/Makefile.am b/src/kv/Makefile.am
index 95a189576afe6..5fcbe8012307c 100644
--- a/src/kv/Makefile.am
+++ b/src/kv/Makefile.am
@@ -25,8 +25,15 @@ else
 NPROC = nproc
 endif
 
+# explicitly disable jemalloc unless we are using it.
+if WITH_JEMALLOC
+DISABLE_JEMALLOC = 0
+else
+DISABLE_JEMALLOC = 1
+endif
+
 rocksdb/librocksdb.a:
-	cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS="${ROCKSDBCXX_FLAGS}" PORTABLE=1 ${MAKE} -j$(shell ${NPROC}) static_lib
+	cd rocksdb && CC="${CC}" CXX="${CXX}" EXTRA_CXXFLAGS="${ROCKSDBCXX_FLAGS}" PORTABLE=1 DISABLE_JEMALLOC="${DISABLE_JEMALLOC}" ${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