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 98ff95888de4a4ca825f16adcf88dea38942a97a..5898a03b4d23b4e6612bb8a7f36fc2edb350a199 100644 (file)
--- 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 ffbd3f9c00aad8792f1381431e1eae1b7e63e35d..adda581e041033191895a024445a09f7e466a180 100755 (executable)
--- 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
 }