From ada312c14d77598cc1858563f9934f56a5975b6b Mon Sep 17 00:00:00 2001 From: Chendi Xue Date: Thu, 4 Jun 2015 14:24:53 +0800 Subject: [PATCH] ceph: enable rocksdb support(shared mode) Without this, user cannot choose to use RocksDB even they manually installed RockDB. Signed-off-by: Xiaoxi Chen --- build-ceph-deb.sh | 2 +- build-ceph-gcov.sh | 2 +- build-ceph-notcmalloc.sh | 2 +- build-ceph-rpm.sh | 2 +- build-ceph.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-ceph-deb.sh b/build-ceph-deb.sh index 146b0b3..c2647e9 100755 --- a/build-ceph-deb.sh +++ b/build-ceph-deb.sh @@ -27,7 +27,7 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--with-tcmalloc +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc --with-librocksdb" [ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then diff --git a/build-ceph-gcov.sh b/build-ceph-gcov.sh index 31ccf8a..3969947 100755 --- a/build-ceph-gcov.sh +++ b/build-ceph-gcov.sh @@ -25,7 +25,7 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc --enable-coverage" +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc --enable-coverage --with-librocksdb" [ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-tcmalloc --with-libatomic-ops --with-gtk2 --with-profiler --enable-cephfs-java $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then diff --git a/build-ceph-notcmalloc.sh b/build-ceph-notcmalloc.sh index 049720e..05a13c9 100755 --- a/build-ceph-notcmalloc.sh +++ b/build-ceph-notcmalloc.sh @@ -26,7 +26,7 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--without-tcmalloc +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS="--without-tcmalloc --with-librocksdb" [ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g" ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-profiler $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then diff --git a/build-ceph-rpm.sh b/build-ceph-rpm.sh index 068d903..6bf3890 100755 --- a/build-ceph-rpm.sh +++ b/build-ceph-rpm.sh @@ -52,7 +52,7 @@ echo --START-IGNORE-WARNINGS autoconf || true echo --STOP-IGNORE-WARNINGS -[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--with-tcmalloc +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc --with-librocksdb" [ ! -x configure ] || ./configure --with-debug --with-radosgw --with-fuse --with-libatomic-ops --with-gtk2 --with-nss $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then diff --git a/build-ceph.sh b/build-ceph.sh index e6a7f44..b2532a5 100755 --- a/build-ceph.sh +++ b/build-ceph.sh @@ -24,7 +24,7 @@ echo --START-IGNORE-WARNINGS [ ! -x autogen.sh ] || ./autogen.sh || exit 1 autoconf || true echo --STOP-IGNORE-WARNINGS -[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS=--with-tcmalloc +[ -z "$CEPH_EXTRA_CONFIGURE_ARGS" ] && CEPH_EXTRA_CONFIGURE_ARGS="--with-tcmalloc --with-librocksdb" [ ! -x configure ] || CFLAGS="-fno-omit-frame-pointer -g -O2" CXXFLAGS="-fno-omit-frame-pointer -g" ./configure --with-debug --with-radosgw --with-libatomic-ops --without-lttng --disable-static $CEPH_EXTRA_CONFIGURE_ARGS || exit 2 if [ ! -e Makefile ]; then