diff options
| author | Thomas Dickerson <elfprince13@gmail.com> | 2023-09-21 06:27:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-21 05:27:11 -0500 |
| commit | 5d331d4141d07648a906b9f0ab76079c68b4cfb2 (patch) | |
| tree | 1cf8394b6a8366d64a6f40727260ba179957c3d7 | |
| parent | bd8d0324a9a06c7acd81485b265ec2a48b579cec (diff) | |
| download | spack-5d331d4141d07648a906b9f0ab76079c68b4cfb2.tar.gz spack-5d331d4141d07648a906b9f0ab76079c68b4cfb2.tar.bz2 spack-5d331d4141d07648a906b9f0ab76079c68b4cfb2.tar.xz spack-5d331d4141d07648a906b9f0ab76079c68b4cfb2.zip | |
Bazel patch specs were too restrictive (#40084)
These patches should always be applied - the existing Bazel code is always wrong, working on some older compilers was a lucky fluke.
| -rw-r--r-- | var/spack/repos/builtin/packages/bazel/package.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index fddd87ddc2..705eef43b9 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -479,13 +479,14 @@ class Bazel(Package): # https://blog.bazel.build/2021/05/21/bazel-4-1.html conflicts("platform=darwin target=aarch64:", when="@:4.0") - # patches for compiling bazel-4.1:4 with gcc-11 + # patches for compiling various older bazels which had ICWYU + # violations revealed by (but not unique to) GCC 11 header changes. # these are derived from # https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/29084/ - patch("gcc11_1.patch", when="@0.3.2:4%gcc@11:") - patch("gcc11_2.patch", when="@0.3.2:4%gcc@11:") - patch("gcc11_3.patch", when="@0.3:4%gcc@11:") - patch("gcc11_4.patch", when="@4.1:4%gcc@11:") + patch("gcc11_1.patch", when="@0.3.2:4") + patch("gcc11_2.patch", when="@0.3.2:4") + patch("gcc11_3.patch", when="@0.3:4") + patch("gcc11_4.patch", when="@4.1:4") # bazel-4.0.0 does not compile with gcc-11 # newer versions of grpc and abseil dependencies are needed but are not in |