From 08b00f8804c988d95430ff9087894f9e5c7712cc Mon Sep 17 00:00:00 2001 From: Tiziano Müller Date: Thu, 2 Dec 2021 00:00:01 +0100 Subject: cp2k: fix build issues without cuda, and with elpa on openSUSE (#27738) --- var/spack/repos/builtin/packages/cp2k/package.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py index 42958771ff..18ec324a7e 100644 --- a/var/spack/repos/builtin/packages/cp2k/package.py +++ b/var/spack/repos/builtin/packages/cp2k/package.py @@ -486,11 +486,11 @@ class Cp2k(MakefilePackage, CudaPackage): # Currently AOCC support only static libraries of ELPA if '%aocc' in spec: - libs.append(join_path(elpa.prefix.lib, + libs.append(join_path(elpa.libs.directories[0], ('libelpa{elpa_suffix}.a' .format(elpa_suffix=elpa_suffix)))) else: - libs.append(join_path(elpa.prefix.lib, + libs.append(join_path(elpa.libs.directories[0], ('libelpa{elpa_suffix}.{dso_suffix}' .format(elpa_suffix=elpa_suffix, dso_suffix=dso_suffix)))) @@ -661,7 +661,7 @@ class Cp2k(MakefilePackage, CudaPackage): ] def build(self, spec, prefix): - if len(spec.variants['cuda_arch'].value) > 1: + if '+cuda' in spec and len(spec.variants['cuda_arch'].value) > 1: raise InstallError("cp2k supports only one cuda_arch at a time") # Apparently the Makefile bases its paths on PWD -- cgit v1.2.3-70-g09d2