From 6edb20c7a63d5b0777ee7b1f89b91a6e70a0a492 Mon Sep 17 00:00:00 2001
From: Satish Balay <balay@mcs.anl.gov>
Date: Sat, 29 Oct 2022 04:34:45 -0500
Subject: mumps: update URLs, and add versions 5.5.0, 5.5.1 (#33597)
---
.../packages/mumps/mumps.src-makefile.5.5.patch | 25 ++++++++++++++++++++++
var/spack/repos/builtin/packages/mumps/package.py | 9 +++++---
2 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 var/spack/repos/builtin/packages/mumps/mumps.src-makefile.5.5.patch
diff --git a/var/spack/repos/builtin/packages/mumps/mumps.src-makefile.5.5.patch b/var/spack/repos/builtin/packages/mumps/mumps.src-makefile.5.5.patch
new file mode 100644
index 0000000000..d56d7ad745
--- /dev/null
+++ b/var/spack/repos/builtin/packages/mumps/mumps.src-makefile.5.5.patch
@@ -0,0 +1,25 @@
+diff --git a/src/Makefile b/src/Makefile
+index 2562522..9dfa43e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -215,7 +215,7 @@ $(libdir)/libmumps_common$(PLAT)$(LIBEXT_SHARED): $(OBJS_COMMON_MOD) $(OBJS
+ $(FC) $(OPTL) -shared $^ -Wl,-soname,libmumps_common$(PLAT).so -L$(libdir) $(RPATH_OPT) $(LORDERINGS) $(LIBS) $(LIBOTHERS) -o $@
+
+ $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER)
+- $(AR)$@ $?
++ $(AR)$@ $? $(EXTRA_LIBS4MUMPS)
+ $(RANLIB) $@
+
+ $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT_SHARED): $(OBJS_MOD) $(OBJS_OTHER) $(libdir)/libmumps_common$(PLAT)$(LIBEXT_SHARED)
+@@ -434,9 +434,9 @@ $(OBJS_OTHER):$(OBJS_COMMON_MOD) $(OBJS_MOD)
+
+ .SUFFIXES: .c .F .o
+ .F.o:
+- $(FC) $(OPTF) $(FPIC) -I. -I../include $(INCS) $(IORDERINGSF) $(ORDERINGSF) -c $*.F $(OUTF)$*.o
++ $(FC) $(OPTF) $(FC_PIC_FLAG) $(FPIC) -I. -I../include $(INCS) $(IORDERINGSF) $(ORDERINGSF) -c $*.F $(OUTF)$*.o
+ .c.o:
+- $(CC) $(OPTC) $(FPIC) -I../include $(INCS) $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -c $*.c $(OUTC)$*.o
++ $(CC) $(OPTC) $(CC_PIC_FLAG) $(FPIC) -I../include $(INCS) $(CDEFS) $(IORDERINGSC) $(ORDERINGSC) -c $*.c $(OUTC)$*.o
+
+ $(ARITH)mumps_c.o: mumps_c.c
+ $(CC) $(OPTC) $(FPIC) -I../include $(INCS) $(CDEFS) -DMUMPS_ARITH=MUMPS_ARITH_$(ARITH) \
diff --git a/var/spack/repos/builtin/packages/mumps/package.py b/var/spack/repos/builtin/packages/mumps/package.py
index 7d0d5c950b..e0aff4a756 100644
--- a/var/spack/repos/builtin/packages/mumps/package.py
+++ b/var/spack/repos/builtin/packages/mumps/package.py
@@ -13,9 +13,11 @@ from spack.package import *
class Mumps(Package):
"""MUMPS: a MUltifrontal Massively Parallel sparse direct Solver"""
- homepage = "http://mumps.enseeiht.fr"
- url = "http://mumps.enseeiht.fr/MUMPS_5.3.5.tar.gz"
+ homepage = "https://graal.ens-lyon.fr/MUMPS/index.php"
+ url = "https://graal.ens-lyon.fr/MUMPS/MUMPS_5.5.1.tar.gz"
+ version("5.5.1", sha256="1abff294fa47ee4cfd50dfd5c595942b72ebfcedce08142a75a99ab35014fa15")
+ version("5.5.0", sha256="e54d17c5e42a36c40607a03279e0704d239d71d38503aab68ef3bfe0a9a79c13")
version("5.4.1", sha256="93034a1a9fe0876307136dcde7e98e9086e199de76f1c47da822e7d4de987fa8")
version("5.4.0", sha256="c613414683e462da7c152c131cebf34f937e79b30571424060dd673368bbf627")
version("5.3.5", sha256="e5d665fdb7043043f0799ae3dbe3b37e5b200d1ab7a6f7b2a4e463fd89507fa4")
@@ -68,7 +70,8 @@ class Mumps(Package):
# The following patches src/Makefile to fix some dependency
# issues in lib[cdsz]mumps.so
patch("mumps.src-makefile.5.2.patch", when="@5.2.0 +shared")
- patch("mumps.src-makefile.5.3.patch", when="@5.3.0: +shared")
+ patch("mumps.src-makefile.5.3.patch", when="@5.3.0:5.4.1 +shared")
+ patch("mumps.src-makefile.5.5.patch", when="@5.5.0: +shared")
conflicts("+parmetis", when="~mpi", msg="You cannot use the parmetis variant without mpi")
conflicts("+parmetis", when="~metis", msg="You cannot use the parmetis variant without metis")
--
cgit v1.2.3-70-g09d2