]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Build: Allow jemalloc enabled build with rocksdb-static 7368/head
authorSomnath Roy <somnath.roy@sandisk.com>
Wed, 27 Jan 2016 00:05:40 +0000 (19:05 -0500)
committerSomnath Roy <somnath.roy@sandisk.com>
Wed, 27 Jan 2016 00:05:40 +0000 (19:05 -0500)
Presently, we can't do jemalloc enabled OSD build along with
rocksdb-static.Rocksdb is now mandatory with Bluestore and that's why
jemalloc builds are failing. Sometimes back the following commit
fd7a35731854528dde10deb3444a82ae4c1a9206 is introduced to build rocksdb
with jemalloc as well, so, we can allow jemalloc build along with
rocksdb-static now. Removing the redundant check from configure.ac.

Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
configure.ac

index b79f6ff3ce7fdf2fd2ff24e72e3261e40891c3cf..8b6949111476535ac45241bd09dbea41fad5f0a5 100644 (file)
@@ -826,14 +826,6 @@ AS_IF([test "x$with_librocksdb_static" = "xyes"], [
 AM_CONDITIONAL(HAVE_BZLIB, [test "x$have_bzlib" = "xyes"])
 AM_CONDITIONAL(HAVE_LZ4, [test "x$have_lz4" = "xyes"])
 
-# error out if --with-jemalloc and --with-librocksdb_static as rocksdb uses tcmalloc
-if test "x$with_jemalloc" = "xyes"; then
-       if test "x$with_librocksdb_static" != "xno"; then
-               AC_MSG_FAILURE([--with-jemalloc called with --with-librocksdb_static, turn off
-                               --with-librocksdb-static or --with-jemalloc])
-       fi
-fi
-
 # needs libcurl and libxml2
 if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
    AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))