summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2023-12-20 11:15:36 +0100
committerGitHub <noreply@github.com>2023-12-20 11:15:36 +0100
commit2fda288cc56e6df5d036419577358dfe17d270d1 (patch)
tree5d3b4bd50e78ccbdedffa467b077f9b8344700ed /var
parent9986652b27d27ad1e3053a357852b96714257041 (diff)
downloadspack-2fda288cc56e6df5d036419577358dfe17d270d1.tar.gz
spack-2fda288cc56e6df5d036419577358dfe17d270d1.tar.bz2
spack-2fda288cc56e6df5d036419577358dfe17d270d1.tar.xz
spack-2fda288cc56e6df5d036419577358dfe17d270d1.zip
Fujitsu packages: require %fj (#41755)
These packages were written before the "requires" directive, and so they are conflicting with all compilers but Fujitsu to express they _require_ `%fj`
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/fujitsu-fftw/package.py11
-rw-r--r--var/spack/repos/builtin/packages/fujitsu-mpi/package.py12
-rw-r--r--var/spack/repos/builtin/packages/fujitsu-ssl2/package.py13
3 files changed, 4 insertions, 32 deletions
diff --git a/var/spack/repos/builtin/packages/fujitsu-fftw/package.py b/var/spack/repos/builtin/packages/fujitsu-fftw/package.py
index b93ed50f92..e24236ad36 100644
--- a/var/spack/repos/builtin/packages/fujitsu-fftw/package.py
+++ b/var/spack/repos/builtin/packages/fujitsu-fftw/package.py
@@ -50,16 +50,7 @@ class FujitsuFftw(FftwBase):
when="%fj",
msg="ARM-SVE vector instructions only works in single or double precision",
)
- conflicts("%arm")
- conflicts("%cce")
- conflicts("%apple-clang")
- conflicts("%clang")
- conflicts("%gcc")
- conflicts("%intel")
- conflicts("%nag")
- conflicts("%pgi")
- conflicts("%xl")
- conflicts("%xl_r")
+ requires("%fj")
def autoreconf(self, spec, prefix):
if spec.target != "a64fx":
diff --git a/var/spack/repos/builtin/packages/fujitsu-mpi/package.py b/var/spack/repos/builtin/packages/fujitsu-mpi/package.py
index d765a0f940..cb49aa62d5 100644
--- a/var/spack/repos/builtin/packages/fujitsu-mpi/package.py
+++ b/var/spack/repos/builtin/packages/fujitsu-mpi/package.py
@@ -13,18 +13,8 @@ class FujitsuMpi(Package):
homepage = "https://www.fujitsu.com/us/"
- conflicts("%arm")
- conflicts("%cce")
- conflicts("%apple-clang")
- conflicts("%clang")
- conflicts("%gcc")
- conflicts("%intel")
- conflicts("%nag")
- conflicts("%pgi")
- conflicts("%xl")
- conflicts("%xl_r")
-
provides("mpi@3.1:")
+ requires("%fj")
def install(self, spec, prefix):
raise InstallError("Fujitsu MPI is not installable; it is vendor supplied")
diff --git a/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py b/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py
index d61d40f126..14a4796e0b 100644
--- a/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py
+++ b/var/spack/repos/builtin/packages/fujitsu-ssl2/package.py
@@ -18,21 +18,12 @@ class FujitsuSsl2(Package):
variant("parallel", default=True, description="Build with thread-parallel versions")
- conflicts("%arm")
- conflicts("%cce")
- conflicts("%apple-clang")
- conflicts("%clang")
- conflicts("%gcc")
- conflicts("%intel")
- conflicts("%nag")
- conflicts("%pgi")
- conflicts("%xl")
- conflicts("%xl_r")
-
provides("blas")
provides("lapack")
provides("scalapack")
+ requires("%fj")
+
def install(self, spec, prefix):
raise InstallError(
"Fujitsu SSL2 is not installable; it is vendor supplied \