[mpich] 18/20: Disable builtin atomics on armhf

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository mpich.

commit dd7976edfdaacdf5e9dca6434b91ed62253eea73
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Sep 24 16:25:20 2017 +0100

    Disable builtin atomics on armhf
---
 debian/changelog | 1 +
 debian/rules     | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b90b17..69b9646 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ mpich (3.3~a2-3) UNRELEASED; urgency=medium
   * Set TZ=UTC+0 during build for reproducible font sorting
   * Enable libfabric, ibverbs on appropriate archs
   * Disable romio on hurd-i386
+  * Disable builtin atomics on armhf
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sun, 13 Aug 2017 11:40:01 +0100
 
diff --git a/debian/rules b/debian/rules
index 8e116d9..17ea9ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ export MPILIBNAME=mpich
 NO_ROMIO_ARCH:= hurd-i386
 NO_VERBS_ARCH:= hurd-i386 kfreebsd-amd64 kfreebsd-i386 s390x
 FABRIC_ARCH:= amd64 i386 
-BUILTIN_ATOMICS:=
+BUILTIN_ATOMICS:= armhf
 
 ifeq (,$(findstring  " $(DEB_HOST_ARCH)",$(NO_ROMIO_ARCH)))
 	VERBS := --disable-romio
@@ -28,7 +28,7 @@ ifneq (,$(findstring  " $(DEB_HOST_ARCH)",$(NO_VERBS_ARCH)))
 	VERBS := --with-ibverbs
 endif
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(BUILTIN_ATOMICS_ARCH)))
-	ENABLE_BUILTIN_ATOMICS:= --enable-builtin-atomics
+	DISABLE_BUILTIN_ATOMICS:= --with-atomic-primitives=no
 endif
 ifneq (,$(findstring $(DEB_HOST_ARCH),$(FABRIC_ARCH)))
 	FABRIC := --with-libfabric
@@ -38,6 +38,7 @@ extra_flags += \
         $(ROMIO) \
 	$(VERBS) \
 	$(FABRIC) \
+	$(DISABLE_BUILTIN_ATOMICS) \
 	--enable-shared \
 	--prefix=/usr \
 	--enable-fortran=all \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mpich.git