From 30090167b4e3ecb8b82aaf5bb88b31deefb664fd Mon Sep 17 00:00:00 2001 From: Yun Peng Date: Wed, 21 Sep 2022 21:53:03 +0200 Subject: [PATCH] Upgrade grpc to 1.49.0 and make sure it builds (#7538) Co-authored-by: Derek Bailey --- WORKSPACE | 5 ++++- grpc/build_grpc_with_cxx14.patch | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 grpc/build_grpc_with_cxx14.patch diff --git a/WORKSPACE b/WORKSPACE index b7078572402..5b364e0989f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -56,10 +56,13 @@ http_archive( ) ##### GRPC -_GRPC_VERSION = "1.48.0" # https://github.com/grpc/grpc/releases/tag/v1.48.0 +_GRPC_VERSION = "1.49.0" # https://github.com/grpc/grpc/releases/tag/v1.48.0 http_archive( name = "com_github_grpc_grpc", + patch_args = ["-p1"], + patches = ["//grpc:build_grpc_with_cxx14.patch"], + sha256 = "15715e1847cc9e42014f02c727dbcb48e39dbdb90f79ad3d66fe4361709ff935", strip_prefix = "grpc-" + _GRPC_VERSION, urls = ["https://github.com/grpc/grpc/archive/refs/tags/v" + _GRPC_VERSION + ".tar.gz"], ) diff --git a/grpc/build_grpc_with_cxx14.patch b/grpc/build_grpc_with_cxx14.patch new file mode 100644 index 00000000000..38cdfe9931b --- /dev/null +++ b/grpc/build_grpc_with_cxx14.patch @@ -0,0 +1,10 @@ +diff --git a/bazel/copts.bzl b/bazel/copts.bzl +index 10be944f25..879518b92f 100644 +--- a/bazel/copts.bzl ++++ b/bazel/copts.bzl +@@ -59,4 +59,4 @@ GRPC_LLVM_WARNING_FLAGS = [ + GRPC_DEFAULT_COPTS = select({ + "//:use_strict_warning": GRPC_LLVM_WARNING_FLAGS + ["-DUSE_STRICT_WARNING=1"], + "//conditions:default": [], +-}) ++}) + ["-std=c++14"]