Skip to content

Commit a933a42

Browse files
committed
protobuf: conflict with abseil-cpp@20250512: for @26:29
The `absl::if_constexpr` target was removed in the 20250512 release of abseil-cpp. protobuf attempts to link to it in versions 26:29 Signed-off-by: Zack Galbreath <zack.galbreath@kitware.com>
1 parent 63c3850 commit a933a42

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

repos/spack_repo/builtin/packages/protobuf/package.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ class Protobuf(CMakePackage):
118118
depends_on("abseil-cpp@20230125.3:", when="@22.5:")
119119
# https://github.com/protocolbuffers/protobuf/issues/11828#issuecomment-1433557509
120120
depends_on("abseil-cpp@20230125:", when="@22:")
121+
# protobuf@26:29 link to absl::if_constexpr, which was removed from abseil-cpp in the
122+
# 20250512 release.
123+
# https://github.com/protocolbuffers/protobuf/issues/24785
124+
conflicts("^abseil-cpp@20250512:", when="@26:29")
121125
depends_on("zlib-api")
122126

123127
# See https://github.com/protocolbuffers/protobuf/issues/26383

stacks/hep/spack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ spack:
147147
- py-uhi
148148
- py-uproot +lz4 +xrootd +zstd
149149
- py-vector
150-
#- py-zfit
150+
- py-zfit
151151
- pythia8 +evtgen +fastjet +hdf5 +hepmc +hepmc3 +lhapdf ~madgraph5amc +python +rivet ~root # pythia8 and root circularly depend
152152
- recola
153153
- rivet

0 commit comments

Comments
 (0)