From: Alfredo Deza Date: Mon, 15 Aug 2016 16:09:13 +0000 (-0400) Subject: ceph-dev-setup: detect flavor options to extend configure args X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be67891bff5ced4c3eaf6f44a5f7787e8b30a1d3;p=ceph-build.git ceph-dev-setup: detect flavor options to extend configure args Signed-off-by: Alfredo Deza --- diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build index 42be370c3..7abdc2c9a 100644 --- a/ceph-dev-setup/build/build +++ b/ceph-dev-setup/build/build @@ -38,6 +38,28 @@ fi echo "Running submodule update ..." git submodule update --init +# Flavor Builds support +# TODO: enable CMAKE +#export CEPH_EXTRA_CMAKE_ARGS + +FLAVOR_FLAGS="--without-cryptopp" + +if [ "${FLAVOR}" == "notcmalloc" ] +then + echo "Detected notcmalloc flavor: will use flag: --without-tcmalloc" + FLAVOR_FLAGS="$FLAVOR_FLAGS --without-tcmalloc" + #export CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=libc" +else + FLAVOR_FLAGS="$FLAVOR_FLAGS --with-tcmalloc" + #export CEPH_EXTRA_CMAKE_ARGS="$CEPH_EXTRA_CMAKE_ARGS -DALLOCATOR=tcmalloc" +fi + +if [ "${FLAVOR}" == "blkin" ] +then + echo "Detected bklin flavor: will use flag: --with-blkin" + FLAVOR_FLAGS="$FLAVOR_FLAGS --with-blkin" +fi + echo "Running autogen.sh ..." ./autogen.sh echo "Running configure ..." @@ -52,6 +74,7 @@ echo "Running configure ..." '--with-radosgw' \ '--disable-static' \ '--without-lttng' \ + $FLAVOR_FLAGS \ 'CFLAGS= -Wno-unused-parameter' \ 'CXXFLAGS= -Wno-unused-parameter' \ --cache-file=/dev/null \