From 5e13018330255ab21f0a7946ae891bf16888e1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= Date: Wed, 10 Mar 2021 19:49:24 +0100 Subject: [PATCH] Update third_party/benchmark to v1.5.2 (#25184) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fix the following error when compiling: error: #error C++11 or greater detected by the library. BENCHMARK_HAS_CXX11 is defined. 12 | #error C++11 or greater detected by the library. BENCHMARK_HAS_CXX11 is defined. | ^~~~~ Signed-off-by: Clément Péron --- bazel/grpc_deps.bzl | 8 ++++---- third_party/benchmark | 2 +- tools/run_tests/sanity/check_submodules.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index e9e9a38ce47..b51dff1e2f4 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -211,11 +211,11 @@ def grpc_deps(): if "com_github_google_benchmark" not in native.existing_rules(): http_archive( name = "com_github_google_benchmark", - sha256 = "f68aec93154d010324c05bcd8c5cc53468b87af88d87acb5ddcfaa1bba044837", - strip_prefix = "benchmark-090faecb454fbd6e6e17a75ef8146acb037118d4", + sha256 = "daa4a97e0547d76de300e325a49177b199f3689ce5a35e25d47696f7cb050f86", + strip_prefix = "benchmark-73d4d5e8d6d449fc8663765a42aa8aeeee844489", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz", - "https://github.com/google/benchmark/archive/090faecb454fbd6e6e17a75ef8146acb037118d4.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz", + "https://github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz", ], ) diff --git a/third_party/benchmark b/third_party/benchmark index 090faecb454..73d4d5e8d6d 160000 --- a/third_party/benchmark +++ b/third_party/benchmark @@ -1 +1 @@ -Subproject commit 090faecb454fbd6e6e17a75ef8146acb037118d4 +Subproject commit 73d4d5e8d6d449fc8663765a42aa8aeeee844489 diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 334267eb33d..5b1455cd88a 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -27,7 +27,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $1 }' | sort > "$submodules" cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" 6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c third_party/abseil-cpp (heads/master) - 090faecb454fbd6e6e17a75ef8146acb037118d4 third_party/benchmark (v1.5.0) + 73d4d5e8d6d449fc8663765a42aa8aeeee844489 third_party/benchmark (v1.5.2) 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty (remotes/origin/wide-14-g73594cd) 1a7359455220f7010def8c63f7c7e041ce6707c6 third_party/boringssl-with-bazel (remotes/origin/master-with-bazel) e982924acee7f7313b4baa4ee5ec000c5e373c30 third_party/cares/cares (cares-1_15_0)