From b976563af252a63b646a01d3baada4d8064ff1ff Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 28 Mar 2016 20:14:02 +0200 Subject: [PATCH] buildpackages: do not try tcmalloc on arm64 Signed-off-by: Loic Dachary --- tasks/buildpackages/common.sh | 4 +++- tasks/buildpackages/make-deb.sh | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tasks/buildpackages/common.sh b/tasks/buildpackages/common.sh index 98ff95888de4a..5898a03b4d23b 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 ffbd3f9c00aad..adda581e04103 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 } -- 2.39.5