From e1ecea7abcc37693cf3f85b740ebf648318db41b Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 18 Jun 2024 00:07:15 -0700 Subject: [PATCH] Uprev google/benchmark and remove upstreamed patch https://github.com/google/benchmark/pull/1803 --- WORKSPACE | 9 +++------ patches/benchmark_as_system_include.patch | 22 ---------------------- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 patches/benchmark_as_system_include.patch diff --git a/WORKSPACE b/WORKSPACE index 8061764f..cc44986c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -12,12 +12,9 @@ http_archive( http_archive( name = "com_google_benchmark", - urls = ["https://github.com/google/benchmark/archive/bc946b919cac6f25a199a526da571638cfde109f.tar.gz"], - strip_prefix = "benchmark-bc946b919cac6f25a199a526da571638cfde109f", - sha256 = "997090899b61ff5a3f7f6714bc9147694d4f85266dbb93277ba9e6d60009a776", - patches = [ - "//:patches/benchmark_as_system_include.patch", - ] + urls = ["https://github.com/google/benchmark/archive/447752540c71f34d5d71046e08192db181e9b02b.tar.gz"], + strip_prefix = "benchmark-447752540c71f34d5d71046e08192db181e9b02b", + sha256 = "df1235e0e37297e990bb833c723cd3dec61fc95c4951f64bdd5c72d1cea7f4f9", ) http_archive( diff --git a/patches/benchmark_as_system_include.patch b/patches/benchmark_as_system_include.patch deleted file mode 100644 index 3daf1f7c..00000000 --- a/patches/benchmark_as_system_include.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/BUILD.bazel b/BUILD.bazel -index f7a1162..cd31663 100644 ---- BUILD.bazel -+++ BUILD.bazel -@@ -87,7 +87,7 @@ cc_library( - "_LARGEFILE64_SOURCE", - "_LARGEFILE_SOURCE", - ], -- strip_include_prefix = "include", -+ includes = ["include"], - visibility = ["//visibility:public"], - deps = select({ - ":perfcounters": ["@libpfm"], -@@ -102,7 +102,7 @@ cc_library( - "include/benchmark/benchmark.h", - "include/benchmark/export.h", - ], -- strip_include_prefix = "include", -+ includes = ["include"], - visibility = ["//visibility:public"], - deps = [":benchmark"], - )