diff options
| author | Martin Aumüller <aumuell@reserv.at> | 2023-08-09 13:44:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-09 13:44:05 +0200 |
| commit | bdca875eb32d9689bb5142964d88cc9488338e39 (patch) | |
| tree | 638d562e096048da67f02b40a62fab1f8536b945 | |
| parent | af8c392de2a5c7c1b1ca1448964dbd4bab87c43a (diff) | |
| download | spack-bdca875eb32d9689bb5142964d88cc9488338e39.tar.gz spack-bdca875eb32d9689bb5142964d88cc9488338e39.tar.bz2 spack-bdca875eb32d9689bb5142964d88cc9488338e39.tar.xz spack-bdca875eb32d9689bb5142964d88cc9488338e39.zip | |
protobuf: fix build for 3.21 on Centos 8 (#39162)
apply upstream patch
| -rw-r--r-- | var/spack/repos/builtin/packages/protobuf/package.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/protobuf/package.py b/var/spack/repos/builtin/packages/protobuf/package.py index 2d48500b71..491b6a80cd 100644 --- a/var/spack/repos/builtin/packages/protobuf/package.py +++ b/var/spack/repos/builtin/packages/protobuf/package.py @@ -104,6 +104,13 @@ class Protobuf(CMakePackage): sha256="fa1abf042eddc1b3b43875dc018c651c90cd1c0c5299975a818a1610bee54ab8", ) + # fix build on Centos 8, see also https://github.com/protocolbuffers/protobuf/issues/5144 + patch( + "https://github.com/protocolbuffers/protobuf/pull/11032/commits/3039f932aaf212bcf2f14a3f2fd00dbfb881e46b.patch?full_index=1", + when="@:3.21", + sha256="cefc4bf4aadf9ca33a336b2aa6d0d82006b6563e85122ae8cfb70345f85321dd", + ) + patch("msvc-abseil-target-namespace.patch", when="@3.22 %msvc") def fetch_remote_versions(self, *args, **kwargs): |