summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-03-29 05:11:50 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-03-29 05:11:50 -0700
commitb3a384e1d838d86eb82ab95ac81f7233891a3838 (patch)
treef6a8dd3308e5afc09f3469a1ddb0f0ee847dafaa
parenta05bea7de5f9f196ffd5179b6df327c3e5ceb9d8 (diff)
parent63c3feb79e7e4022e5565deb9f2749fa9732e7d2 (diff)
downloadspack-b3a384e1d838d86eb82ab95ac81f7233891a3838.tar.gz
spack-b3a384e1d838d86eb82ab95ac81f7233891a3838.tar.bz2
spack-b3a384e1d838d86eb82ab95ac81f7233891a3838.tar.xz
spack-b3a384e1d838d86eb82ab95ac81f7233891a3838.zip
Merge pull request #680 from davydden/hypre_muparser_fixes
minor fixes to hypre and muparser on Linux
-rw-r--r--var/spack/repos/builtin/packages/hypre/package.py3
-rw-r--r--var/spack/repos/builtin/packages/muparser/package.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py
index 0e99553293..4b915daa68 100644
--- a/var/spack/repos/builtin/packages/hypre/package.py
+++ b/var/spack/repos/builtin/packages/hypre/package.py
@@ -42,6 +42,9 @@ class Hypre(Package):
if '~internal-superlu' in self.spec:
configure_args.append("--without-superlu")
+ # MLI and FEI do not build without superlu on Linux
+ configure_args.append("--without-mli")
+ configure_args.append("--without-fei")
# Hypre's source is staged under ./src so we'll have to manually
# cd into it.
diff --git a/var/spack/repos/builtin/packages/muparser/package.py b/var/spack/repos/builtin/packages/muparser/package.py
index a1a9ff90e5..19ca8ce287 100644
--- a/var/spack/repos/builtin/packages/muparser/package.py
+++ b/var/spack/repos/builtin/packages/muparser/package.py
@@ -14,5 +14,5 @@ class Muparser(Package):
configure(*options)
- make()
+ make(parallel=False)
make("install")