third_party/grpc/absl.patch | 11 +++++++++++ third_party/grpc/grpc_1.33.1.patch | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/third_party/grpc/absl.patch b/third_party/grpc/absl.patch new file mode 100644 index 0000000000..aeb6916c6f --- /dev/null +++ b/third_party/grpc/absl.patch @@ -0,0 +1,11 @@ +diff -ur abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d_orig/absl/synchronization/internal/graphcycles.cc abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d/absl/synchronization/internal/graphcycles.cc +--- abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d_orig/absl/synchronization/internal/graphcycles.cc 2020-03-04 12:57:37.000000000 -0800 ++++ abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d/absl/synchronization/internal/graphcycles.cc 2022-01-28 12:27:26.588456815 -0800 +@@ -35,6 +35,7 @@ + + #include "absl/synchronization/internal/graphcycles.h" + ++#include + #include + #include + #include "absl/base/internal/hide_ptr.h" diff --git a/third_party/grpc/grpc_1.33.1.patch b/third_party/grpc/grpc_1.33.1.patch index dda6fc177e..f426d02b63 100644 --- a/third_party/grpc/grpc_1.33.1.patch +++ b/third_party/grpc/grpc_1.33.1.patch @@ -120,3 +120,15 @@ index c047f0c515..7c24fbc617 100644 ":windows": "@com_github_grpc_grpc//third_party/cares:config_windows/ares_config.h", ":android": "@com_github_grpc_grpc//third_party/cares:config_android/ares_config.h", "//conditions:default": "@com_github_grpc_grpc//third_party/cares:config_linux/ares_config.h", +diff -ur grpc-1.33.1/bazel/grpc_deps.bzl grpc-1.33.1/bazel/grpc_deps.bzl +--- grpc-1.33.1/bazel/grpc_deps.bzl 2022-02-05 16:50:14.780031906 -0800 ++++ grpc-1.33.1/bazel/grpc_deps.bzl 2022-02-05 16:51:56.670953159 -0800 +@@ -241,6 +241,8 @@ + name = "com_google_absl", + sha256 = "f368a8476f4e2e0eccf8a7318b98dafbe30b2600f4e3cf52636e5eb145aba06a", + strip_prefix = "abseil-cpp-df3ea785d8c30a9503321a3d35ee7d35808f190d", ++ patch_args = ["-p1"], ++ patches = ["@io_bazel//third_party/grpc:absl.patch"], + urls = [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/df3ea785d8c30a9503321a3d35ee7d35808f190d.tar.gz",