From dff0faadb26de30f9458424c97ab9294acda0b85de6d7301d92613f014c360c8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 14 Nov 2023 13:46:42 +0000 Subject: [PATCH] Accepting request 1125846 from home:glaubitz:branches:devel:tools - Adjust RPATH handling to fix FTBFS on SLE-15 * Set CMAKE_SKIP_RPATH to FALSE * Set CMAKE_SKIP_INSTALL_RPATH to TRUE - Build with gcc-12 on SLE-15 to fix FTBFS on ppc64le OBS-URL: https://build.opensuse.org/request/show/1125846 OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=167 --- grpc.changes | 8 ++++++++ grpc.spec | 12 +++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/grpc.changes b/grpc.changes index 90d1e60..88fc06a 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 14 10:21:58 UTC 2023 - John Paul Adrian Glaubitz + +- Adjust RPATH handling to fix FTBFS on SLE-15 + * Set CMAKE_SKIP_RPATH to FALSE + * Set CMAKE_SKIP_INSTALL_RPATH to TRUE +- Build with gcc-12 on SLE-15 to fix FTBFS on ppc64le + ------------------------------------------------------------------- Tue Oct 31 05:21:51 UTC 2023 - Jan Engelhardt diff --git a/grpc.spec b/grpc.spec index f24a842..184ecc6 100644 --- a/grpc.spec +++ b/grpc.spec @@ -31,7 +31,11 @@ Source2: %name-rpmlintrc 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 @@ -124,6 +128,10 @@ This subpackage contains source code of the gRPC reference implementation. 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 @@ -141,7 +149,9 @@ export CXXFLAGS="$CFLAGS" -DgRPC_SSL_PROVIDER=package \ -DZLIB_LIBRARY=%{_libdir}/libz.so \ -DgRPC_ZLIB_PROVIDER=package \ - -DCMAKE_CXX_STANDARD=17 + -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_SKIP_RPATH=FALSE \ + -DCMAKE_SKIP_INSTALL_RPATH=TRUE %cmake_build %install