]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
ceph-dev-setup: detect flavor options to extend configure args
authorAlfredo Deza <adeza@redhat.com>
Mon, 15 Aug 2016 16:09:13 +0000 (12:09 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 17 Aug 2016 13:55:54 +0000 (09:55 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
ceph-dev-setup/build/build

index 42be370c3b49878da3f1c06b767cef3a249525a4..7abdc2c9a1d05b4828cb5b7f6a9f01e3e03f34d7 100644 (file)
@@ -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 \