SHA256
1
0
forked from jengelh/grpc

Accepting request 1125885 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/1125885
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grpc?expand=0&rev=67
This commit is contained in:
Ana Guerrero 2023-11-15 20:06:43 +00:00 committed by Git OBS Bridge
commit 86daa1f36e
2 changed files with 19 additions and 1 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 14 10:21:58 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
- 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 <jengelh@inai.de> Tue Oct 31 05:21:51 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

View File

@ -31,7 +31,11 @@ Source2: %name-rpmlintrc
BuildRequires: abseil-cpp-devel BuildRequires: abseil-cpp-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes
%if 0%{?suse_version} < 1550
BuildRequires: gcc12-c++
%else
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%endif
BuildRequires: opencensus-proto-source BuildRequires: opencensus-proto-source
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(libcares) >= 1.19.1 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/ rm -Rf third_party/abseil-cpp/
%build %build
%if 0%{?suse_version} < 1550
export CC=gcc-12
export CXX=g++-12
%endif
%define _lto_cflags %nil %define _lto_cflags %nil
# protoc is invoked strangely; make it happy with this dir or it will assert() # protoc is invoked strangely; make it happy with this dir or it will assert()
mkdir -p third_party/protobuf/src mkdir -p third_party/protobuf/src
@ -141,7 +149,9 @@ export CXXFLAGS="$CFLAGS"
-DgRPC_SSL_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \
-DZLIB_LIBRARY=%{_libdir}/libz.so \ -DZLIB_LIBRARY=%{_libdir}/libz.so \
-DgRPC_ZLIB_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \
-DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD=17 \
-DCMAKE_SKIP_RPATH=FALSE \
-DCMAKE_SKIP_INSTALL_RPATH=TRUE
%cmake_build %cmake_build
%install %install