From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 28 Mar 2016 18:14:02 +0000 (+0200)
Subject: buildpackages: do not try tcmalloc on arm64
X-Git-Tag: v10.2.6~165^2^2~128^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b976563af252a63b646a01d3baada4d8064ff1ff;p=ceph.git

buildpackages: do not try tcmalloc on arm64

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/tasks/buildpackages/common.sh b/tasks/buildpackages/common.sh
index 98ff95888de4..5898a03b4d23 100644
--- a/tasks/buildpackages/common.sh
+++ b/tasks/buildpackages/common.sh
@@ -51,7 +51,9 @@ function init_ceph() {
 function flavor2configure() {
     local flavor=$1
 
-    if test $flavor = notcmalloc ; then
+    eval $(dpkg-architecture)
+
+    if test $flavor = notcmalloc || test $DEB_BUILD_ARCH = arm64 ; then
         echo --without-tcmalloc --without-cryptopp
     fi
 }
diff --git a/tasks/buildpackages/make-deb.sh b/tasks/buildpackages/make-deb.sh
index ffbd3f9c00aa..adda581e0410 100755
--- a/tasks/buildpackages/make-deb.sh
+++ b/tasks/buildpackages/make-deb.sh
@@ -105,6 +105,7 @@ function build_package() {
     #
     # create the packages (with ccache)
     #
+    export CEPH_EXTRA_CONFIGURE_ARGS=$(flavor2configure $flavor)
     j=$(maybe_parallel $NPROC $vers)
     PATH=/usr/lib/ccache:$PATH dpkg-buildpackage $j -uc -us -sa
 }