From 58c7c8e7040408a2f537e70f9fbdc1b86c1a6c09ad3f4f0570b7ad10ababffa2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Oct 2020 12:32:37 +0000 Subject: [PATCH] - Use -DgRPC_ABSL_PROVIDER=package (https://github.com/grpc/grpc/issues/24476) OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=72 --- grpc.changes | 6 ++++++ grpc.spec | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/grpc.changes b/grpc.changes index 2cb70fb..6c5fb33 100644 --- a/grpc.changes +++ b/grpc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 27 12:31:44 UTC 2020 - Jan Engelhardt + +- Use -DgRPC_ABSL_PROVIDER=package + (https://github.com/grpc/grpc/issues/24476) + ------------------------------------------------------------------- Thu Oct 22 11:15:31 UTC 2020 - Atri Bhattacharya diff --git a/grpc.spec b/grpc.spec index f78f564..234bbb5 100644 --- a/grpc.spec +++ b/grpc.spec @@ -31,7 +31,7 @@ Source: https://github.com/grpc/grpc/archive/v%version.tar.gz Source2: %name-rpmlintrc # PATCH-FIX-UPSTREAM grpc-correct-pkgconfig-path.patch badshah400@gmail.com -- Make path for pkgconfig file installation consistent with gRPC_INSTALL_LIBDIR specification Patch1: grpc-correct-pkgconfig-path.patch -BuildRequires: abseil-cpp-source +BuildRequires: abseil-cpp-devel BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -129,8 +129,7 @@ This subpackage contains source code of the gRPC reference implementation. %prep %autosetup -p1 -# Copy abseil-cpp source into empty third_party/abseil-cpp dir -cp -r %_prefix/src/abseil-cpp/* third_party/abseil-cpp/ +rm -Rf third_party/abseil-cpp/ %build %define _lto_cflags %nil @@ -141,8 +140,8 @@ export CFLAGS="%optflags -Wno-error" export CXXFLAGS="$CFLAGS" %cmake -DgRPC_INSTALL=ON \ -DgRPC_INSTALL_LIBDIR:PATH="%_lib" \ - -DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir"/cmake/grpc \ - -DgRPC_ABSL_PROVIDER=module \ + -DgRPC_INSTALL_CMAKEDIR:PATH="%_libdir/cmake/grpc" \ + -DgRPC_ABSL_PROVIDER=package \ -DgRPC_CARES_PROVIDER=package \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_RE2_PROVIDER=package \