diff options
Diffstat (limited to 'testing/bazel4/patch_ftbfs_gcc11_4.patch')
-rw-r--r-- | testing/bazel4/patch_ftbfs_gcc11_4.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/testing/bazel4/patch_ftbfs_gcc11_4.patch b/testing/bazel4/patch_ftbfs_gcc11_4.patch deleted file mode 100644 index 795bc82b75f..00000000000 --- a/testing/bazel4/patch_ftbfs_gcc11_4.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/third_party/grpc/grpc_1.33.1.patch -+++ b/third_party/grpc/grpc_1.33.1.patch -@@ -58,6 +58,14 @@ index 09fcad95a2..9b737e5deb 100644 - ) - - native.bind( -+@@ -245,6 +245,7 @@ def grpc_deps(): -+ "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", -+ ], -++ patches = ["@com_github_grpc_grpc//:third_party/abseil-cpp/absl.patch"], -+ ) -+ -+ if "bazel_toolchains" not in native.existing_rules(): - diff --git a/bazel/grpc_extra_deps.bzl b/bazel/grpc_extra_deps.bzl - index 4c1dfad2e8..f63c54ddef 100644 - --- a/bazel/grpc_extra_deps.bzl -@@ -120,3 +128,25 @@ 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", -+ -+--- /dev/null -++++ b/third_party/abseil-cpp/absl.patch -+@@ -0,0 +1,18 @@ -++0e2c62da1dcaf6529abab952bdcc96c6de2d9506 by Abseil Team <absl-team@google.com>: -++ -++Add missing <limits> include -++ -++PiperOrigin-RevId: 339054753 -++ -++-- -++ -++--- absl/synchronization/internal/graphcycles.cc -+++++ absl/synchronization/internal/graphcycles.cc -++@@ -37,6 +37,7 @@ -++ -++ #include <algorithm> -++ #include <array> -+++#include <limits> -++ #include "absl/base/internal/hide_ptr.h" -++ #include "absl/base/internal/raw_logging.h" -++ #include "absl/base/internal/spinlock.h" |