[adios] 03/13: Fix MPI_LIBS for s390x build

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Mar 1 11:42:52 UTC 2016


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

mckinstry pushed a commit to tag debian/1.9.0-8
in repository adios.

commit 5b8d7bee4ff98a823fdb17fde88be482551f5c02
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Nov 1 06:41:44 2015 +0000

    Fix MPI_LIBS for s390x build
---
 debian/changelog | 6 ++++++
 debian/rules     | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e4db42c..b3e2e43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+adios (1.9.0-4) unstable; urgency=medium
+
+  * Fix MPI_LIBS for s390x build
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 01 Nov 2015 06:41:15 +0000
+
 adios (1.9.0-3) unstable; urgency=medium
 
   * Remove mpi-workaround.patch, breaks build on non-mpich archs
diff --git a/debian/rules b/debian/rules
index c2cc804..3eb16f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,13 @@ MPI_LIBS:= -Wl,-z,relro -lmpich -lopa -lmpl -lrt -lcr -lpthread
 endif
 ifeq ($(MPI), openmpi)
 MPI_LIBS:= -L/usr/lib/openmpi/lib -L/usr//lib -lmpi_f90 -lmpi_f77 -lmpi 
-endif
+eodif
 # TODO: also mpich2 for x32 ...
 #
 # Do tests on little-endian only for the moment;
+ifeq ($(ARCH),s390x)
+MPI_LIBS:= Wl,-z,relro  -lmpich -lopa -lmpl  -lrt -lpthread
+endif
 ifeq ($(ARCH), powerpc)
 #   DO_TEST:= false
 endif

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



More information about the debian-science-commits mailing list