From 96c97f546d520487c3b390dc02ddfc0159f4bff4 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Wed, 17 Apr 2024 04:00:22 +0000 Subject: [PATCH 1/3] fix: Update boringssl to match Envoy (2022-02-07 -> 2023-08-28) Fixes build warning-as-error: ``` external/boringssl/src/crypto/x509/t_x509.c:326:18: error: variable 'l' set but not used [-Werror,-Wunused-but-set-variable] int ret = 0, l, i; ^ ``` Signed-off-by: Martijn Stevenson --- bazel/repositories.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 89b0900e5..60a48548c 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -87,10 +87,10 @@ def proxy_wasm_cpp_host_repositories(): maybe( http_archive, name = "boringssl", - # 2022-02-07 (master-with-bazel) - sha256 = "7dec97795a7ac7e3832228e4440ee06cceb18d3663f4580b0840e685281e28a0", - strip_prefix = "boringssl-eaa29f431f71b8121e1da76bcd3ddc2248238ade", - urls = ["https://github.com/google/boringssl/archive/eaa29f431f71b8121e1da76bcd3ddc2248238ade.tar.gz"], + # 2023-08-28 (master-with-bazel) + sha256 = "f1f421738e9ba39dd88daf8cf3096ddba9c53e2b6b41b32fff5a3ff82f4cd162", + strip_prefix = "boringssl-45cf810dbdbd767f09f8cb0b0fcccd342c39041f", + urls = ["https://github.com/google/boringssl/archive/45cf810dbdbd767f09f8cb0b0fcccd342c39041f.tar.gz"], ) maybe( From a60411495f94cf519375a4a481857dcaac0692d7 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Wed, 17 Apr 2024 04:17:08 +0000 Subject: [PATCH 2/3] fix: Make buildifier happy Signed-off-by: Martijn Stevenson --- BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 66c3371d6..215459eb2 100644 --- a/BUILD +++ b/BUILD @@ -12,7 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_cc//cc:defs.bzl", "cc_library") load( "@proxy_wasm_cpp_host//bazel:select.bzl", "proxy_wasm_select_engine_null", @@ -22,6 +21,7 @@ load( "proxy_wasm_select_engine_wasmtime", "proxy_wasm_select_engine_wavm", ) +load("@rules_cc//cc:defs.bzl", "cc_library") licenses(["notice"]) # Apache 2 From 70af61f69f540edcf78fd5f3108cbf03a0c975c3 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Sun, 28 Apr 2024 23:17:21 +0000 Subject: [PATCH 3/3] Split out BUILD order fix to PR#394 Signed-off-by: Martijn Stevenson --- BUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD b/BUILD index 215459eb2..66c3371d6 100644 --- a/BUILD +++ b/BUILD @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +load("@rules_cc//cc:defs.bzl", "cc_library") load( "@proxy_wasm_cpp_host//bazel:select.bzl", "proxy_wasm_select_engine_null", @@ -21,7 +22,6 @@ load( "proxy_wasm_select_engine_wasmtime", "proxy_wasm_select_engine_wavm", ) -load("@rules_cc//cc:defs.bzl", "cc_library") licenses(["notice"]) # Apache 2