From: Somnath Roy Date: Wed, 27 Jan 2016 00:05:40 +0000 (-0500) Subject: Build: Allow jemalloc enabled build with rocksdb-static X-Git-Tag: v10.0.4~136^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a45f484a9d89184d88e7cedd5ffdbdf334c14491;p=ceph.git Build: Allow jemalloc enabled build with rocksdb-static 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 --- diff --git a/configure.ac b/configure.ac index b79f6ff3ce7f..8b6949111476 100644 --- a/configure.ac +++ b/configure.ac @@ -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]))