daroche/nginx-otel-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop using system provided RE2 for static build.

Browse source 
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 fa28f37dab)
This commit is contained in:
Dmitry Plotnikov 2024-03-01 18:48:39 +00:00 • committed by Sergey A. Osokin
parent b845bf4172
commit be044dedbe
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -22,13 +22,12 @@ if(NGX_OTEL_FETCH_DEPS)
grpc grpc
GIT_REPOSITORY https://github.com/grpc/grpc GIT_REPOSITORY https://github.com/grpc/grpc
GIT_TAG 02384e39185f109bd299eb8482306229967dc970 # v1.46.7 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) GIT_SHALLOW ON)
set(gRPC_USE_PROTO_LITE ON CACHE INTERNAL "") set(gRPC_USE_PROTO_LITE ON CACHE INTERNAL "")
set(gRPC_INSTALL OFF CACHE INTERNAL "") set(gRPC_INSTALL OFF CACHE INTERNAL "")
set(gRPC_CARES_PROVIDER package 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_SSL_PROVIDER package CACHE INTERNAL "")
set(gRPC_ZLIB_PROVIDER package CACHE INTERNAL "") set(gRPC_ZLIB_PROVIDER package CACHE INTERNAL "")