From be044dedbe037a55f85f75f2083916286671f82d Mon Sep 17 00:00:00 2001 From: Dmitry Plotnikov Date: Fri, 1 Mar 2024 18:48:39 +0000 Subject: [PATCH] Stop using system provided RE2 for static build. Starting with 2023-06-01 RE2 publicly depends on Abseil, so we can't use system provided RE2 together with gRPC-bundled Abseil. (cherry picked from commit fa28f37dab4e7836fe92407940e407b843e41f2e) --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 910300c..c04c400 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,13 +22,12 @@ if(NGX_OTEL_FETCH_DEPS) grpc GIT_REPOSITORY https://github.com/grpc/grpc GIT_TAG 02384e39185f109bd299eb8482306229967dc970 # v1.46.7 - GIT_SUBMODULES third_party/protobuf third_party/abseil-cpp + GIT_SUBMODULES third_party/protobuf third_party/abseil-cpp third_party/re2 GIT_SHALLOW ON) set(gRPC_USE_PROTO_LITE ON CACHE INTERNAL "") set(gRPC_INSTALL OFF CACHE INTERNAL "") set(gRPC_CARES_PROVIDER package CACHE INTERNAL "") - set(gRPC_RE2_PROVIDER package CACHE INTERNAL "") set(gRPC_SSL_PROVIDER package CACHE INTERNAL "") set(gRPC_ZLIB_PROVIDER package CACHE INTERNAL "")