From e76bf4dc78f7b081c82295137f96ce7c6e83f293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Legat?= <benoit.legat@gmail.com>
Date: Mon, 3 Jun 2019 21:41:51 +0200
Subject: [PATCH] Use latest Mumps

---
 build_tarballs.jl                |  6 ++----
 bundled/patches/apply_quiet.diff | 12 ------------
 bundled/patches/quiet.diff       | 21 ---------------------
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 bundled/patches/apply_quiet.diff
 delete mode 100644 bundled/patches/quiet.diff

diff --git a/build_tarballs.jl b/build_tarballs.jl
index 1c3ceea..8138e65 100755
--- a/build_tarballs.jl
+++ b/build_tarballs.jl
@@ -32,8 +32,6 @@ fi
 
 ## First build SDPA
 
-mv $WORKSPACE/srcdir/patches/quiet.diff .
-patch -p1 < $WORKSPACE/srcdir/patches/apply_quiet.diff
 patch -p1 < $WORKSPACE/srcdir/patches/shared.diff
 mv configure.in configure.ac
 patch -p1 < $WORKSPACE/srcdir/patches/lt_init.diff
@@ -94,9 +92,9 @@ dependencies = [
     "https://github.com/JuliaOpt/COINBLASBuilder/releases/download/v1.4.6-1-static/build_COINBLASBuilder.v1.4.6.jl",
     "https://github.com/JuliaOpt/COINLapackBuilder/releases/download/v1.5.6-1-static/build_COINLapackBuilder.v1.5.6.jl",
     "https://github.com/JuliaOpt/COINMetisBuilder/releases/download/v1.3.5-1-static/build_COINMetisBuilder.v1.3.5.jl",
-    "https://github.com/JuliaOpt/COINMumpsBuilder/releases/download/v1.6.0-1-static/build_COINMumpsBuilder.v1.6.0.jl",
+    "https://github.com/JuliaOpt/COINMumpsBuilder/releases/download/v1.6.0-1-static-nm/build_COINMumpsBuilder.v1.6.0.jl",
     "https://github.com/JuliaInterop/libcxxwrap-julia/releases/download/v0.5.3/build_libcxxwrap-julia-1.0.v0.5.3.jl",
-    "https://github.com/JuliaPackaging/JuliaBuilder/releases/download/v1.0.0-2/build_Julia.v1.0.0.jl"    
+    "https://github.com/JuliaPackaging/JuliaBuilder/releases/download/v1.0.0-2/build_Julia.v1.0.0.jl"
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
diff --git a/bundled/patches/apply_quiet.diff b/bundled/patches/apply_quiet.diff
deleted file mode 100644
index 94c278e..0000000
--- a/bundled/patches/apply_quiet.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/mumps/Makefile b/mumps/Makefile
-index da175ce..4efad51 100644
---- a/mumps/Makefile
-+++ b/mumps/Makefile
-@@ -26,6 +26,7 @@ build/lib/libdmumps.a:${MUMPS_TAR_FILE}
- 	rm -rf build;
- 	tar xzf ${MUMPS_TAR_FILE}
- 	mv mumps-${MUMPS_VER}/ build;
-+	patch -p1 < ../quiet.diff
- 	cd build; cp Make.inc/Makefile.inc.generic.SEQ Makefile.inc;
- 
- 	cd build; echo "CC = "   ${CC}       >> Makefile.inc;
diff --git a/bundled/patches/quiet.diff b/bundled/patches/quiet.diff
deleted file mode 100644
index d8015fa..0000000
--- a/bundled/patches/quiet.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/mumps/build/src/dmumps_part1.F b/mumps/build/src/dmumps_part1.F
-index af0b62a..55e372e 100644
---- a/build/src/dmumps_part1.F
-+++ b/build/src/dmumps_part1.F
-@@ -104,16 +104,6 @@ C       matrix in assembled format (ICNTL(5)=0, and ICNTL(18) $\neq$ 3),
-         MPG     = id%ICNTL(3)
-         PROK    = ((MP.GT.0).AND.(id%ICNTL(4).GE.3))
-         PROKG   = ( MPG .GT. 0 .and. id%MYID .eq. MASTER )
--        IF (PROKG) THEN
--           IF (id%ICNTL(5) .NE. 1) THEN
--              WRITE(MPG,'(A,I4,I12,I15)') 
--     &             'Entering DMUMPS driver with JOB, N, NZ =', JOB,N,NZ
--           ELSE
--              WRITE(MPG,'(A,I4,I12,I15)') 
--     &             'Entering DMUMPS driver with JOB, N, NELT =', JOB,N
--     &             ,NELT
--           ENDIF
--        ENDIF
-       ELSE
-         MPG = 0
-         PROK = .FALSE.