[adios] 06/13: * Don't include '-lcr' on x32, 68k either. * Use mpif90 instead of mpif77 for MPIFC. (Fix FTBFS on sparc)

[Alastair McKinstry]

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 a6fc48852fcf0dc78df1a66a60aaf11ffe012c6e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jan 1 22:48:29 2016 +0000

    * Don't include '-lcr' on x32, 68k either.
    * Use mpif90 instead of mpif77 for MPIFC. (Fix FTBFS on sparc)
---
 debian/changelog |  7 +++++++
 debian/rules     | 29 ++++++++++++-----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f973dd0..59964d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+adios (1.9.0-6) unstable; urgency=medium
+
+  * Don't include '-lcr' on x32, 68k either.
+  * Use mpif90 instead of mpif77 for MPIFC. (Fix FTBFS on sparc)
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 01 Jan 2016 22:46:11 +0000
+
 adios (1.9.0-5) unstable; urgency=medium
 
   * Fix typo in build rules for s390x.
diff --git a/debian/rules b/debian/rules
index 2d9e78f..0359727 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,27 +12,22 @@ MPI=$(ARCH_DEFAULT_MPI_IMPL)
 # TODO: This should come from `pkg-config mpi --libs` ...
 ifeq ($(MPI), mpich)
 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 
-eodif
-# TODO: also mpich2 for x32 ...
-#
-# Do tests on little-endian only for the moment;
-ifeq ($(ARCH),s390x)
+ifeq ($(ARCH),hppa)
 MPI_LIBS:= -Wl,-z,relro  -lmpich -lopa -lmpl  -lrt -lpthread
 endif
-ifeq ($(ARCH),hppa)
-	MPI_LIBS:= -Wl,-z,relro  -lmpich -lopa -lmpl  -lrt -lpthread
+ifeq ($(ARCH), m68k)
+MPI_LIBS:= -Wl,-z,relro -lmpich -lopa -lmpl -lrt -lpthread
 endif
-ifeq ($(ARCH), powerpc)
-#   DO_TEST:= false
+ifeq ($(ARCH), x32)
+MPI_LIBS:= -Wl,-z,relro -lmpich -lopa -lmpl -lrt -lpthread
 endif
-ifeq ($(ARCH), sparc)
-#   DO_TEST:= false
 endif
-ifeq ($(ARCH), mips)
-#   DO_TEST:= false
+
+ifeq ($(MPI), openmpi)
+MPI_LIBS:= -L/usr/lib/openmpi/lib -L/usr//lib -lmpi_f90 -lmpi_f77 -lmpi 
+endif
+ifeq ($(ARCH),s390x)
+MPI_LIBS:= -Wl,-z,relro  -lmpich -lopa -lmpl  -lrt -lpthread
 endif
 ifeq ($(ARCH),hurd-i386)
   WITH_IBVERBS:=
@@ -82,7 +77,7 @@ override_dh_auto_configure:
 		--with-phdf5-incdir=/usr/include/hdf5/$(MPI) \
 		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(MPI) \
 		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
-		--prefix=/usr MPICC=mpicc.$(MPI) MPIFC=mpif77.$(MPI) CFLAGS='$(CFLAGS) -I$(LIBDIR)/glib-2.0/include' \
+		--prefix=/usr MPICC=mpicc.$(MPI) MPIFC=mpif90.$(MPI) CFLAGS='$(CFLAGS) -I$(LIBDIR)/glib-2.0/include' \
 		LIBS=' $(MPI_LIBS) -lpthread' 
 
 override_dh_auto_build:

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