[mpich] 16/20: * Set TZ=UTC+0 during build for reproducible font sorting * Enable libfabric, ibverbs on appropriate archs

[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 4cc31def1e749c1e5d9e6ee50de2c3a58becefeb
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Sep 24 16:04:22 2017 +0100

    * Set TZ=UTC+0 during build for reproducible font sorting
    * Enable libfabric, ibverbs on appropriate archs
---
 debian/changelog |  2 ++
 debian/control   |  2 ++
 debian/rules     | 16 ++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5813bd9..3eb8f65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mpich (3.3~a2-3) UNRELEASED; urgency=medium
   * Standards-Version: 4.1.0; no changes required
   * Set Debhelper COMPAT level 10. automake, dh-autoreconf no longer needed
   * mpich-doc now marked Multi-Arch: foreign
+  * Set TZ=UTC+0 during build for reproducible font sorting
+  * Enable libfabric, ibverbs on appropriate archs
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sun, 13 Aug 2017 11:40:01 +0100
 
diff --git a/debian/control b/debian/control
index e57bf54..50b17e0 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,8 @@ Priority: extra
 Build-Depends: debhelper (>= 10),
                gfortran (>= 4:5.2.1),
                hwloc-nox,
+               libibverbs-dev (>= 1.1.7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libfabric-dev [amd64 i386],
                libcr-dev [amd64 armel armhf i386 powerpc ppc64 powerpcspe],
                libhwloc-dev,
                libxt-dev,
diff --git a/debian/rules b/debian/rules
index eac0629..700d500 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,27 @@ export MPICHLIB_FFLAGS=$(shell dpkg-buildflags --get FFLAGS)
 export MPICHLIB_FCFLAGS=$(shell dpkg-buildflags --get FFLAGS)
 export FC=gfortran
 export F77=gfortran
+export TZ=UTC+0
 
 # Keep old library naming scheme
 export MPILIBNAME=mpich
 
+NO_VERBS_ARCH:= hurd-i386 kfreebsd-amd64 kfreebsd-i386 s390x
+FABRIC_ARCH:= amd64 i386 
+BUILTIN_ATOMICS:=
+
+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
+endif
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(FABRIC_ARCH)))
+	FABRIC := --with-libfabric
+endif
+
 extra_flags += \
+	$(VERBS) $(FABRIC) \
 	--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