[mumps] 01/02: link scalapack using MUMPS_MPI not openmpi (could be mpich)

[Drew Parsons]

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

dparsons pushed a commit to tag debian/5.1.2-4
in repository mumps.

commit de663583ed783c13c60a13350e1cb1cd845e1bc6
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 25 07:08:29 2017 +1100

    link scalapack using MUMPS_MPI not openmpi (could be mpich)
    
    is mpich on m68k (and sh4, once scalapack builds on it)
---
 debian/Makefile.par.inc      | 6 +++---
 debian/Makefile.ptscotch.inc | 6 +++---
 debian/Makefile.scotch.inc   | 4 ++--
 debian/Makefile.seq.inc      | 4 ++--
 debian/changelog             | 7 +++++++
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/Makefile.par.inc b/debian/Makefile.par.inc
index 1078b9c..78e79ac 100644
--- a/debian/Makefile.par.inc
+++ b/debian/Makefile.par.inc
@@ -3,10 +3,10 @@
 #  on Mon Mar 20 14:34:33 UTC 2017
 #
 # These settings for a PC under Debian/linux with standard packages :
-# metis (parmetis), scotch (ptscotch), openmpi, gfortran
+# metis (parmetis), scotch (ptscotch), mpi (openmpi|mpich), gfortran
 
 # packages installation : 
-# apt-get install libmetis-dev libparmetis-dev libscotch-dev libptscotch-dev libatlas-base-dev openmpi-bin libopenmpi-dev lapack-dev
+# apt-get install libmetis-dev libparmetis-dev libscotch-dev libptscotch-dev libatlas-base-dev mpi-default-dev lapack-dev
 
 # Adapted by Drew Parsons from Make.inc/Makefile.debian.PAR
 # based on Adam Powell's earlier adaptation from Makefile.gfortran.par
@@ -55,7 +55,7 @@ FL = mpifort
 AR = ar vr 
 RANLIB = ranlib
 LAPACK = -llapack
-SCALAP  = -lscalapack-openmpi
+SCALAP  = -lscalapack-$(MUMPS_MPI)
 
 INCPAR = -I/usr/include/mpi
 
diff --git a/debian/Makefile.ptscotch.inc b/debian/Makefile.ptscotch.inc
index a0129e1..8e94d42 100644
--- a/debian/Makefile.ptscotch.inc
+++ b/debian/Makefile.ptscotch.inc
@@ -3,10 +3,10 @@
 #  on Mon Mar 20 14:34:33 UTC 2017
 #
 # These settings for a PC under Debian/linux with standard packages :
-# metis (parmetis), scotch (ptscotch), openmpi, gfortran
+# metis (parmetis), scotch (ptscotch), mpi (openmpi|mpich), gfortran
 
 # packages installation : 
-# apt-get install libmetis-dev libparmetis-dev libscotch-dev libptscotch-dev libatlas-base-dev openmpi-bin libopenmpi-dev lapack-dev
+# apt-get install libmetis-dev libparmetis-dev libscotch-dev libptscotch-dev libatlas-base-dev mpi-default-dev lapack-dev
 
 # Adapted by Drew Parsons from Make.inc/Makefile.debian.PAR
 # based on Adam Powell's earlier adaptation from Makefile.gfortran.par
@@ -52,7 +52,7 @@ FL = mpifort
 AR = ar vr 
 RANLIB = ranlib
 LAPACK = -llapack
-SCALAP  = -lscalapack-openmpi
+SCALAP  = -lscalapack-$(MUMPS_MPI)
 
 INCPAR = -I/usr/include/mpi
 
diff --git a/debian/Makefile.scotch.inc b/debian/Makefile.scotch.inc
index 7185142..ec5c24f 100644
--- a/debian/Makefile.scotch.inc
+++ b/debian/Makefile.scotch.inc
@@ -3,10 +3,10 @@
 #  on Mon Mar 20 14:34:33 UTC 2017
 #
 # These settings for a PC under Debian/linux with standard packages :
-# metis (parmetis), scotch (ptscotch), openmpi, gfortran
+# metis (parmetis), scotch, gfortran
 
 # packages installation : 
-# apt-get install libmetis-dev libparmetis-dev libscotch-dev libptscotch-dev libatlas-base-dev openmpi-bin libopenmpi-dev lapack-dev
+# apt-get install libmetis-dev libscotch-dev libatlas-base-dev lapack-dev
 
 # Adapted by Drew Parsons from Make.inc/Makefile.debian.SEQ, based on
 # Adam Powell and Roberto C. Sanchez' earlier adaptations from Makefile.gfortran.seq and Makefile.G95.seq
diff --git a/debian/Makefile.seq.inc b/debian/Makefile.seq.inc
index 8d71cde..ad99b3f 100644
--- a/debian/Makefile.seq.inc
+++ b/debian/Makefile.seq.inc
@@ -3,10 +3,10 @@
 #  on Mon Mar 20 14:34:33 UTC 2017
 #
 # These settings for a PC under Debian/linux with standard packages :
-# metis (parmetis), scotch (ptscotch), openmpi, gfortran
+# metis (parmetis), scotch, gfortran
 
 # packages installation : 
-# apt-get install libmetis-dev libparmetis-dev libscotch-dev libptscotch-dev libatlas-base-dev openmpi-bin libopenmpi-dev lapack-dev
+# apt-get install libmetis-dev libscotch-dev libatlas-base-dev lapack-dev
 
 # Adapted by Drew Parsons from Make.inc/Makefile.debian.SEQ, based on
 # Adam Powell and Roberto C. Sanchez' earlier adaptations from Makefile.gfortran.seq and Makefile.G95.seq
diff --git a/debian/changelog b/debian/changelog
index f76a644..69de120 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mumps (5.1.2-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * link scalapack using MUMPS_MPI not openmpi (could be mpich)
+
+ -- Drew Parsons <dparsons at debian.org>  Mon, 25 Dec 2017 07:05:43 +1100
+
 mumps (5.1.2-3) unstable; urgency=medium
 
   * Team upload.

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