diff --git a/grpc.changes b/grpc.changes index 83d60b4..f02552f 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Apr 3 09:05:38 UTC 2024 - Antonio Larrosa + +- abseil-cpp 20240116 in SP5 can't be used with gcc7 when using + -DCMAKE_CXX_STANDARD=17 since it tries to use the + header file so revert last change to "switch build + compiler back to default on SLE-15" to use gcc12 again. + ------------------------------------------------------------------- Sun Mar 10 11:59:06 UTC 2024 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index cfae2df..401cf28 100644 --- a/grpc.spec +++ b/grpc.spec @@ -34,6 +34,11 @@ Patch5: Fix-compilation-on-RHEL-7-ppc64le-gcc-4.8.patch BuildRequires: abseil-cpp-devel BuildRequires: cmake BuildRequires: fdupes +%if 0%{?suse_version} < 1550 +BuildRequires: gcc12-c++ +%else +BuildRequires: gcc-c++ +%endif BuildRequires: opencensus-proto-source BuildRequires: pkg-config BuildRequires: pkgconfig(libcares) >= 1.19.1 @@ -139,6 +144,12 @@ popd rm -Rf third_party/abseil-cpp/ %build +%if 0%{?suse_version} < 1550 +export CC=gcc-12 +export CXX=g++-12 +%endif +%define _lto_cflags %nil + # protoc is invoked strangely; make it happy with this dir or it will assert() mkdir -p third_party/protobuf/src