summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorSebastian Grimberg <sjg@amazon.com>2023-07-18 22:21:06 -0700
committerGitHub <noreply@github.com>2023-07-19 07:21:06 +0200
commitcf87d9f199ce807c248e0fc34dc215f8d572ea0e (patch)
treee225fef621c6fb37d9874eabcae0b4cc001b43cc /var
parentd7a1a61702e3487f19db8035152e9b6c65815ff1 (diff)
downloadspack-cf87d9f199ce807c248e0fc34dc215f8d572ea0e.tar.gz
spack-cf87d9f199ce807c248e0fc34dc215f8d572ea0e.tar.bz2
spack-cf87d9f199ce807c248e0fc34dc215f8d572ea0e.tar.xz
spack-cf87d9f199ce807c248e0fc34dc215f8d572ea0e.zip
palace: fix bugs introduced in #38910 (#38983)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/palace/package.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/palace/package.py b/var/spack/repos/builtin/packages/palace/package.py
index a13ab27ab6..51d7d4d588 100644
--- a/var/spack/repos/builtin/packages/palace/package.py
+++ b/var/spack/repos/builtin/packages/palace/package.py
@@ -118,23 +118,23 @@ class Palace(CMakePackage):
]
# HYPRE is always built with external BLAS/LAPACK
- args += self.define("HYPRE_REQUIRED_PACKAGES", "LAPACK;BLAS")
+ args += [
+ self.define("HYPRE_REQUIRED_PACKAGES", "LAPACK;BLAS"),
+ self.define("BLAS_LIBRARIES", "{0}".format(self.spec["blas"].libs.joined(";"))),
+ self.define("LAPACK_LIBRARIES", "{0}".format(self.spec["lapack"].libs.joined(";"))),
+ ]
# MPI compiler wrappers are not required, but MFEM test builds need to know to link
# against MPI libraries
if "+superlu-dist" in self.spec:
- args += self.define("SuperLUDist_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI")
+ args += [self.define("SuperLUDist_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI")]
if "+strumpack" in self.spec:
- args += self.define("STRUMPACK_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI;MPI_Fortran")
+ args += [self.define("STRUMPACK_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI;MPI_Fortran")]
if "+mumps" in self.spec:
- args += self.define("MUMPS_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI;MPI_Fortran")
-
- # BLAS/LAPACK linkage
- args += self.define("BLAS_LIBRARIES", "{0}".format(self.spec["blas"].libs.joined(";")))
- args += self.define("LAPACK_LIBRARIES", "{0}".format(self.spec["lapack"].libs.joined(";")))
+ args += [self.define("MUMPS_REQUIRED_PACKAGES", "LAPACK;BLAS;MPI;MPI_Fortran")]
return args
- def install(self, pkg, spec, prefix):
+ def install(self, spec, prefix):
# No install phase for Palace (always performed during build)
pass