[mumps] 01/02: use mpicc, mpifort instead of pkg-config mpi-fort

[Drew Parsons]

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

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

commit bfdb2b231c2bf949ad1d57ec31cd60a0245c7cb4
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Dec 24 23:47:51 2017 +1100

    use mpicc, mpifort instead of pkg-config mpi-fort
    
    to build parallel MUMPS (and PTScotch support)
    
    Since mpi-fort.pc is not available for mpich builds (m68k,sh4).
    
    Closes: #884939.
---
 debian/Makefile.par.inc      | 8 ++++----
 debian/Makefile.ptscotch.inc | 8 ++++----
 debian/changelog             | 9 +++++++++
 debian/control               | 3 +--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/Makefile.par.inc b/debian/Makefile.par.inc
index 67a6d1d..1078b9c 100644
--- a/debian/Makefile.par.inc
+++ b/debian/Makefile.par.inc
@@ -49,9 +49,9 @@ LIBEXT  = .so
 OUTC    = -o 
 OUTF    = -o 
 RM = /bin/rm -f
-CC = gcc
-FC = gfortran
-FL = gfortran
+CC = mpicc
+FC = mpifort
+FL = mpifort
 AR = ar vr 
 RANLIB = ranlib
 LAPACK = -llapack
@@ -59,7 +59,7 @@ SCALAP  = -lscalapack-openmpi
 
 INCPAR = -I/usr/include/mpi
 
-MPIFLIB = $(shell pkg-config mpi-fort --libs)
+MPIFLIB = 
 MPICLIB = -lmpi
 LIBPAR = $(SCALAP) $(LAPACK) $(MPIFLIB)
 
diff --git a/debian/Makefile.ptscotch.inc b/debian/Makefile.ptscotch.inc
index 7a79a9b..a0129e1 100644
--- a/debian/Makefile.ptscotch.inc
+++ b/debian/Makefile.ptscotch.inc
@@ -46,9 +46,9 @@ LIBEXT  = .so
 OUTC    = -o 
 OUTF    = -o 
 RM = /bin/rm -f
-CC = gcc
-FC = gfortran
-FL = gfortran
+CC = mpicc
+FC = mpifort
+FL = mpifort
 AR = ar vr 
 RANLIB = ranlib
 LAPACK = -llapack
@@ -56,7 +56,7 @@ SCALAP  = -lscalapack-openmpi
 
 INCPAR = -I/usr/include/mpi
 
-MPIFLIB = $(shell pkg-config mpi-fort --libs)
+MPIFLIB = 
 MPICLIB = -lmpi
 LIBPAR = $(SCALAP) $(LAPACK) $(MPIFLIB)
 
diff --git a/debian/changelog b/debian/changelog
index 1689e2d..7374291 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mumps (5.1.2-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * use mpicc, mpifort to build parallel MUMPS (and PTScotch support)
+    rather than using pkg-config mpi-fort, since mpi-fort.pc is not
+    available for mpich builds (m68k,sh4). Closes: #884939.
+
+ -- Drew Parsons <dparsons at debian.org>  Sun, 24 Dec 2017 23:46:14 +1100
+
 mumps (5.1.2-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index aa7a8d3..d3d82eb 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,7 @@ Build-Depends:
  libptscotch-dev (>= 5.1.7.dfsg-4),
  libscalapack-mpi-dev (>= 2.0.2),
  libscotch-dev,
- mpi-default-dev,
- pkg-config,
+ mpi-default-dev
 Standards-Version: 4.1.2
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/mumps.git
 Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/mumps.git

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