diff options
| author | Satish Balay <balay@mcs.anl.gov> | 2019-03-28 14:57:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 14:57:51 -0500 |
| commit | 06e82edf15ed65678c0f9619f1984a58b20caaea (patch) | |
| tree | 618b8e455b6192798644c2371812e9b5a0ce5089 /var | |
| parent | a6511fbafcf16dd60d424e9d31b667339857628a (diff) | |
| download | spack-06e82edf15ed65678c0f9619f1984a58b20caaea.tar.gz spack-06e82edf15ed65678c0f9619f1984a58b20caaea.tar.bz2 spack-06e82edf15ed65678c0f9619f1984a58b20caaea.tar.xz spack-06e82edf15ed65678c0f9619f1984a58b20caaea.zip | |
hypre: add a modified superlu-dist patch for @:2.14.0 (#11032)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hypre/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.14.0.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.15.0.patch (renamed from var/spack/repos/builtin/packages/hypre/superlu-dist-link.patch) | 0 |
3 files changed, 15 insertions, 1 deletions
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.patch b/var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.15.0.patch index a2cc930f2d..a2cc930f2d 100644 --- a/var/spack/repos/builtin/packages/hypre/superlu-dist-link.patch +++ b/var/spack/repos/builtin/packages/hypre/superlu-dist-link-2.15.0.patch |