From aa87c747f9d748548cdc463012dacba44ff43b8d Mon Sep 17 00:00:00 2001
From: Rocco Meli <r.meli@bluemail.ch>
Date: Thu, 21 Sep 2023 20:31:17 +0200
Subject: Add missing platform in Charm++ (#40051)
Add missing `linux` platform in Charm++ when building for `arm8`.
---
var/spack/repos/builtin/packages/charmpp/package.py | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
(limited to 'var')
diff --git a/var/spack/repos/builtin/packages/charmpp/package.py b/var/spack/repos/builtin/packages/charmpp/package.py
index 91876fbb13..43ef0d5bbc 100644
--- a/var/spack/repos/builtin/packages/charmpp/package.py
+++ b/var/spack/repos/builtin/packages/charmpp/package.py
@@ -187,9 +187,7 @@ class Charmpp(Package):
("linux", "ppc", "pami"): "pami-linux-ppc64le",
("linux", "ppc", "verbs"): "verbs-linux-ppc64le",
("linux", "arm", "netlrts"): "netlrts-linux-arm7",
- ("linux", "arm", "multicore"): "multicore-arm7",
("linux", "aarch64", "netlrts"): "netlrts-linux-arm8",
- ("linux", "aarch64", "multicore"): "multicore-arm8",
("win", "x86_64", "mpi"): "mpi-win-x86_64",
("win", "x86_64", "multicore"): "multicore-win-x86_64",
("win", "x86_64", "netlrts"): "netlrts-win-x86_64",
@@ -203,10 +201,22 @@ class Charmpp(Package):
versions.update({("linux", "i386", "multicore"): "multicore-linux"})
versions.update({("linux", "i386", "netlrts"): "netlrts-linux"})
versions.update({("linux", "i386", "uth"): "uth-linux"})
+ versions.update(
+ {
+ ("linux", "arm", "multicore"): "multicore-arm7",
+ ("linux", "aarch64", "multicore"): "multicore-arm8",
+ }
+ )
else:
versions.update({("linux", "i386", "mpi"): "mpi-linux-i386"})
versions.update({("linux", "i386", "multicore"): "multicore-linux-i386"})
versions.update({("linux", "i386", "netlrts"): "netlrts-linux-i386"})
+ versions.update(
+ {
+ ("linux", "arm", "multicore"): "multicore-linux-arm7",
+ ("linux", "aarch64", "multicore"): "multicore-linux-arm8",
+ }
+ )
if (plat, mach, comm) not in versions:
raise InstallError(
--
cgit v1.2.3-70-g09d2