diff options
Diffstat (limited to 'var')
8 files changed, 14 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/arm-forge/package.py b/var/spack/repos/builtin/packages/arm-forge/package.py index 952b6f42b1..16d842bd1e 100644 --- a/var/spack/repos/builtin/packages/arm-forge/package.py +++ b/var/spack/repos/builtin/packages/arm-forge/package.py @@ -22,7 +22,7 @@ class ArmForge(Package): # TODO: this mess should be fixed as soon as a way to parametrize/constrain # versions (and checksums) based on the target platform shows up - if platform.machine() == "aarch64": + if platform.machine() in ["aarch64", "arm64"]: version( "22.1.3", sha256="131884f998b82673e885a7b42cc883210e3a0229b50af374092140cdfd42a408" ) diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 93573d4698..e2e9a71112 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -494,6 +494,8 @@ class Cuda(Package): maintainers("ax3l", "Rombur") executables = ["^nvcc$"] + skip_version_audit = ["platform=darwin"] + for ver, packages in _versions.items(): key = "{0}-{1}".format(platform.system(), platform.machine()) pkg = packages.get(key) diff --git a/var/spack/repos/builtin/packages/cudnn/package.py b/var/spack/repos/builtin/packages/cudnn/package.py index df98518c8c..54d6708e40 100644 --- a/var/spack/repos/builtin/packages/cudnn/package.py +++ b/var/spack/repos/builtin/packages/cudnn/package.py @@ -260,6 +260,8 @@ class Cudnn(Package): # need to use modified URLs like in url_for_version. maintainers("adamjstewart", "bvanessen") + skip_version_audit = ["platform=darwin"] + for ver, packages in _versions.items(): key = "{0}-{1}".format(platform.system(), platform.machine()) pkg = packages.get(key) diff --git a/var/spack/repos/builtin/packages/cutensor/package.py b/var/spack/repos/builtin/packages/cutensor/package.py index 15bc9fc22a..9f42a27e95 100644 --- a/var/spack/repos/builtin/packages/cutensor/package.py +++ b/var/spack/repos/builtin/packages/cutensor/package.py @@ -27,6 +27,8 @@ class Cutensor(Package): maintainers("bvanessen") url = "cutensor" + skip_version_audit = ["platform=darwin"] + for ver, packages in _versions.items(): key = "{0}-{1}".format(platform.system(), platform.machine()) pkg = packages.get(key) diff --git a/var/spack/repos/builtin/packages/git-annex/package.py b/var/spack/repos/builtin/packages/git-annex/package.py index 4cc0490ece..ece00cd376 100644 --- a/var/spack/repos/builtin/packages/git-annex/package.py +++ b/var/spack/repos/builtin/packages/git-annex/package.py @@ -47,6 +47,8 @@ class GitAnnex(Package): # - $ git annex whereis git-annex/linux/current/git-annex-standalone-arm64.tar.gz # -> gives web url + skip_version_audit = ["platform=darwin"] + if platform.system() == "Linux" and platform.machine() == "aarch64": # git-annex-standalone-arm64.tar.gz version( diff --git a/var/spack/repos/builtin/packages/hpcviewer/package.py b/var/spack/repos/builtin/packages/hpcviewer/package.py index 670a286427..48a3565769 100644 --- a/var/spack/repos/builtin/packages/hpcviewer/package.py +++ b/var/spack/repos/builtin/packages/hpcviewer/package.py @@ -178,6 +178,8 @@ class Hpcviewer(Package): system = platform.system().lower() machine = platform.machine().lower() + if machine == "arm64": + machine = "aarch64" # Versions for MacOSX / Darwin if system == "darwin": diff --git a/var/spack/repos/builtin/packages/javafx/package.py b/var/spack/repos/builtin/packages/javafx/package.py index f37429a4ab..ceceb9f1c4 100644 --- a/var/spack/repos/builtin/packages/javafx/package.py +++ b/var/spack/repos/builtin/packages/javafx/package.py @@ -20,7 +20,7 @@ _versions = { ), }, "darwin": { - "aarch64": ( + "arm64": ( "https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_osx-aarch64_bin-sdk.zip", "baebdbbe283c17df62fc4c0bdc2bde4415f2253f99ba41437f9336e2272c255e", ), diff --git a/var/spack/repos/builtin/packages/nvhpc/package.py b/var/spack/repos/builtin/packages/nvhpc/package.py index ba5cfd2ac1..b5ce6b44e8 100644 --- a/var/spack/repos/builtin/packages/nvhpc/package.py +++ b/var/spack/repos/builtin/packages/nvhpc/package.py @@ -322,6 +322,8 @@ class Nvhpc(Package): maintainers("samcmill") tags = ["e4s"] + skip_version_audit = ["platform=darwin"] + for ver, packages in _versions.items(): key = "{0}-{1}".format(platform.system(), platform.machine()) pkg = packages.get(key) |