From 3f1f98ca34366a3b7ddfff1641570b3deaee7778 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Thu, 1 Aug 2024 04:40:51 +0000 Subject: [PATCH 1/2] fix: Bump Abseil to fix Linux build issues Pick up this fix: https://github.com/abseil/abseil-cpp/pull/1187 Bump past Envoy to pick up another fix found in fuzz tests: https://github.com/proxy-wasm/proxy-wasm-cpp-host/pull/399#issuecomment-2261871275 Signed-off-by: Martijn Stevenson --- bazel/repositories.bzl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 60a48548c..cf22a9bf8 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -82,7 +82,18 @@ def proxy_wasm_cpp_host_repositories(): patch_args = ["-p1"], ) - # Core. + # Core deps. Try to keep up with Envoy versions: + # https://github.com/envoyproxy/envoy/blob/main/bazel/repository_locations.bzl + + # Note: latest LTS release, ahead of Envoy to pick up a bugfix found in local fuzzing: + # https://github.com/abseil/abseil-cpp/commit/e7858c73279d81cbc005d9c76a385ab535520635 + maybe( + http_archive, + name = "com_google_absl", + sha256 = "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc", + strip_prefix = "abseil-cpp-20240116.2", + urls = ["https://github.com/abseil/abseil-cpp/archive/20240116.2.tar.gz"], + ) maybe( http_archive, From 1cbfeb6a8fccd859cffec8374a5ea1dd1321077e Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Thu, 1 Aug 2024 14:32:45 +0000 Subject: [PATCH 2/2] Expand comments on Abseil pin. Signed-off-by: Martijn Stevenson --- bazel/repositories.bzl | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index cf22a9bf8..12a375595 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -82,11 +82,14 @@ def proxy_wasm_cpp_host_repositories(): patch_args = ["-p1"], ) - # Core deps. Try to keep up with Envoy versions: - # https://github.com/envoyproxy/envoy/blob/main/bazel/repository_locations.bzl - - # Note: latest LTS release, ahead of Envoy to pick up a bugfix found in local fuzzing: - # https://github.com/abseil/abseil-cpp/commit/e7858c73279d81cbc005d9c76a385ab535520635 + # Core deps. Keep them updated. + + # Note: we depend on Abseil via rules_fuzzing. Remove this pin when we update that. + # + # This is the latest LTS release, which picks up: + # - Build fix: https://github.com/abseil/abseil-cpp/pull/1187 + # - A bugfix found in local fuzzing: + # https://github.com/abseil/abseil-cpp/commit/e7858c73279d81cbc005d9c76a385ab535520635 maybe( http_archive, name = "com_google_absl",