RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build: Allow jemalloc enabled build with rocksdb-static

Browse Source 
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>
This commit is contained in:
Somnath Roy 2016-01-26 19:05:40 -05:00
parent dda9a08370
commit a45f484a9d
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View 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]))