diff options
| author | Zach van Rijn <me@zv.io> | 2023-11-02 10:37:45 -0500 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2023-11-02 10:50:54 -0500 |
| commit | 843d1bfd0f5f0fbb008728fe68e62c017d89d84a (patch) | |
| tree | 1e6f413067a4543f22c5d25a7a2bc8e66a5c4538 /user/spack/40841.patch | |
| parent | 6ee3e1a9af10e598569f8497d9389fc2c380a68c (diff) | |
| download | packages-843d1bfd0f5f0fbb008728fe68e62c017d89d84a.tar.gz packages-843d1bfd0f5f0fbb008728fe68e62c017d89d84a.tar.bz2 packages-843d1bfd0f5f0fbb008728fe68e62c017d89d84a.tar.xz packages-843d1bfd0f5f0fbb008728fe68e62c017d89d84a.zip | |
user/spack: support all targets.
* ppc requires explicit -latomic; this patch fixes adelie/spack#6
for both the initial clingo bootstrap and 'spack install clingo'
* fix regression where all targets not supported by golang/rust
could not be bootstrapped; this patch fixes adelie/spack#7
* pmmx still requires the archspec patch; fixes #794
* enable debug output during bootstrap build
* disable buildcache by default (do not attempt to pull binaries)
* fix package paths
Diffstat (limited to 'user/spack/40841.patch')
| -rw-r--r-- | user/spack/40841.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/user/spack/40841.patch b/user/spack/40841.patch new file mode 100644 index 000000000..fb63b32e9 --- /dev/null +++ b/user/spack/40841.patch @@ -0,0 +1,38 @@ +From fcf9e19a418b9db1fa517b98d087a5e387d1af8f Mon Sep 17 00:00:00 2001 +From: Harmen Stoppels <me@harmenstoppels.nl> +Date: Thu, 2 Nov 2023 13:17:14 +0100 +Subject: [PATCH] go/rust bootstrap: no versions if unsupported arch + +The lookup in a dictionary causes KeyError on package load for +unsupported architectures such as i386 and ppc big endian. +--- + var/spack/repos/builtin/packages/go-bootstrap/package.py | 2 +- + var/spack/repos/builtin/packages/rust-bootstrap/package.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/var/spack/repos/builtin/packages/go-bootstrap/package.py b/var/spack/repos/builtin/packages/go-bootstrap/package.py +index 047f9f3353b93..4f5c8f0073243 100644 +--- a/var/spack/repos/builtin/packages/go-bootstrap/package.py ++++ b/var/spack/repos/builtin/packages/go-bootstrap/package.py +@@ -59,7 +59,7 @@ class GoBootstrap(Package): + + # determine system os and architecture/target + os = platform.system().lower() +- target = go_targets[platform.machine().lower()] ++ target = go_targets.get(platform.machine().lower(), platform.machine().lower()) + + # construct releases for current system configuration + for release in go_releases: +diff --git a/var/spack/repos/builtin/packages/rust-bootstrap/package.py b/var/spack/repos/builtin/packages/rust-bootstrap/package.py +index 84100bf2424a1..337618e20e38f 100644 +--- a/var/spack/repos/builtin/packages/rust-bootstrap/package.py ++++ b/var/spack/repos/builtin/packages/rust-bootstrap/package.py +@@ -73,7 +73,7 @@ class RustBootstrap(Package): + + # Determine system os and architecture/target. + os = platform.system().lower() +- target = rust_targets[platform.machine().lower()] ++ target = rust_targets.get(platform.machine().lower(), platform.machine().lower()) + + # Pre-release versions of the bootstrap compiler. + # Note: These versions are unchecksumed since they will change |