From 06e82edf15ed65678c0f9619f1984a58b20caaea Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 28 Mar 2019 14:57:51 -0500 Subject: hypre: add a modified superlu-dist patch for @:2.14.0 (#11032) --- var/spack/repos/builtin/packages/hypre/package.py | 3 ++- .../builtin/packages/hypre/superlu-dist-link-2.14.0.patch | 13 +++++++++++++ .../builtin/packages/hypre/superlu-dist-link-2.15.0.patch | 13 +++++++++++++ .../repos/builtin/packages/hypre/superlu-dist-link.patch | 13 ------------- 4 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.14.0.patch create mode 100644 var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.15.0.patch delete mode 100644 var/spack/repos/builtin/packages/hypre/superlu-dist-link.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index 286d7b20ad..2085efefe5 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -52,7 +52,8 @@ class Hypre(Package): # Patch to build shared libraries on Darwin patch('darwin-shared-libs-for-hypre-2.13.0.patch', when='+shared@2.13.0 platform=darwin') patch('darwin-shared-libs-for-hypre-2.14.0.patch', when='+shared@2.14.0 platform=darwin') - patch('superlu-dist-link.patch') + patch('superlu-dist-link-2.15.0.patch', when='+superlu-dist @2.15:') + patch('superlu-dist-link-2.14.0.patch', when='+superlu-dist @:2.14.0') depends_on("mpi", when='+mpi') depends_on("blas") diff --git a/var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.14.0.patch b/var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.14.0.patch new file mode 100644 index 0000000000..4f024c138c --- /dev/null +++ b/var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.14.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/Makefile b/src/lib/Makefile +index 72875e2..3edc564 100644 +--- a/src/lib/Makefile ++++ b/src/lib/Makefile +@@ -58,7 +58,7 @@ $(BLASFILES)\ + $(LAPACKFILES) + + SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}.so +-SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ ++SOLIBS = ${DSUPERLU_LIBS} ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ + ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS} + + diff --git a/var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.15.0.patch b/var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.15.0.patch new file mode 100644 index 0000000000..a2cc930f2d --- /dev/null +++ b/var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.15.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/Makefile b/src/lib/Makefile +index f49d1683..615947b0 100644 +--- a/src/lib/Makefile ++++ b/src/lib/Makefile +@@ -58,7 +58,7 @@ $(BLASFILES)\ + $(LAPACKFILES) + + SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} +-SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ ++SOLIBS = ${DSUPERLU_LIBS} ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ + ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS} + + diff --git a/var/spack/repos/builtin/packages/hypre/superlu-dist-link.patch b/var/spack/repos/builtin/packages/hypre/superlu-dist-link.patch deleted file mode 100644 index a2cc930f2d..0000000000 --- a/var/spack/repos/builtin/packages/hypre/superlu-dist-link.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib/Makefile b/src/lib/Makefile -index f49d1683..615947b0 100644 ---- a/src/lib/Makefile -+++ b/src/lib/Makefile -@@ -58,7 +58,7 @@ $(BLASFILES)\ - $(LAPACKFILES) - - SONAME = libHYPRE-${HYPRE_RELEASE_VERSION}${HYPRE_LIB_SUFFIX} --SOLIBS = ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ -+SOLIBS = ${DSUPERLU_LIBS} ${MPILIBDIRS} ${MPILIBS} ${LAPACKLIBDIRS} ${LAPACKLIBS}\ - ${BLASLIBDIRS} ${BLASLIBS} ${LIBS} ${FLIBS} - - -- cgit v1.2.3-60-g2f50