badshah400/grpc
SHA256
1
0
Fork 0
forked from jengelh/grpc
Code Pull Requests Activity

Accepting request 1110898 from devel:tools

Browse Source 
- Add fix_grpconfig_cmake.patch to make find_package(gRPC) in
  downstream using packages functional again.

OBS-URL: https://build.opensuse.org/request/show/1110898
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grpc?expand=0&rev=62
This commit is contained in:
Ana Guerrero 2023-09-13 18:43:46 +00:00 committed by Git OBS Bridge
commit d247910b7c
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fix_grpconfig_cmake.patch Normal file
View File

@ -0,0 +1,37 @@
From 5c9e4050c1e8c66b1b8b4e93d48b8e23ff1ea818 Mon Sep 17 00:00:00 2001
From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com>
Date: Wed, 6 Sep 2023 03:35:47 +0800
Subject: [PATCH] [Build] fix `gRPCConfig.cmake` (#33361)
Without this change, calling `find_package(gRPC REQUIRED)` errors out
with
CMake Error at /opt/homebrew/lib/cmake/grpc/gRPCConfig.cmake:8
(find_dependency):
Unknown CMake command "find_dependency".
The issue is that `find_dependency` is provided by the
`CMakeFindDependencyMacro` module[^1], so we need to `include` it before
use.
[^1]:
https://cmake.org/cmake/help/v3.26/module/CMakeFindDependencyMacro.html
---
cmake/protobuf.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
index 80181c6218..fab2eb00e9 100644
--- a/cmake/protobuf.cmake
+++ b/cmake/protobuf.cmake
@@ -86,6 +86,6 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "package")
set(_gRPC_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
endif()
endif()
- set(_gRPC_FIND_PROTOBUF "find_dependency(Protobuf CONFIG)")
+ set(_gRPC_FIND_PROTOBUF "include(CMakeFindDependencyMacro)\nfind_dependency(Protobuf CONFIG)")
endif()
endif()
--
2.42.0

6
grpc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 13 10:49:31 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
- Add fix_grpconfig_cmake.patch to make find_package(gRPC) in
downstream using packages functional again.
-------------------------------------------------------------------
Wed Sep 6 16:02:40 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

1
grpc.spec
View File

@ -39,6 +39,7 @@ BuildRequires: pkgconfig(openssl) >= 1.0.1
BuildRequires: pkgconfig(protobuf) >= 22
BuildRequires: pkgconfig(re2)
BuildRequires: pkgconfig(zlib)
Patch0: fix_grpconfig_cmake.patch
%description
The reference implementation of the gRPC protocol, done on top of