From 1231a528b59cb402748d2991312b7952c2429da9 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 23 Jan 2025 13:26:56 +0800 Subject: [PATCH 1/2] envoy 1.33.0 Signed-off-by: Adrian Cole Co-authored-by: Takeshi Yoneda --- Formula/e/envoy.rb | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/Formula/e/envoy.rb b/Formula/e/envoy.rb index a9a3b6fe13564..6d3781c4b4bf5 100644 --- a/Formula/e/envoy.rb +++ b/Formula/e/envoy.rb @@ -1,11 +1,20 @@ class Envoy < Formula desc "Cloud-native high-performance edge/middle/service proxy" homepage "https://www.envoyproxy.io/index.html" - url "https://github.com/envoyproxy/envoy/archive/refs/tags/v1.31.0.tar.gz" - sha256 "39ba37aed81a9d4988a5736cf558243179f2bf1490843da25687d1aafd9d01c6" license "Apache-2.0" head "https://github.com/envoyproxy/envoy.git", branch: "main" + stable do + url "https://github.com/envoyproxy/envoy/archive/refs/tags/v1.33.0.tar.gz" + sha256 "fd726135761ea163f0312d49960c602c9b4fcb78ca3c36600975fed16e0787c4" + + # Backport disabling libcurl docs to fix build. Remove in the next release. + patch do + url "https://github.com/envoyproxy/envoy/commit/ae6cb3254cbf98999993d0120d289a207a57f825.patch?full_index=1" + sha256 "a5c25bad6884f382909036ac9e8c812c5d3ba3104f2f1d24f5035acf705b0d74" + end + end + livecheck do url :stable regex(/^v?(\d+(?:\.\d+)+)$/i) @@ -39,6 +48,10 @@ class Envoy < Formula depends_on "coreutils" => :build end + on_linux do + depends_on "lld" => :build + end + # https://github.com/envoyproxy/envoy/tree/main/bazel#supported-compiler-versions # GCC/ld.gold had some issues while building envoy 1.29 so use clang/lld instead fails_with :gcc @@ -51,21 +64,32 @@ def install --verbose_failures --action_env=PATH=#{env_path} --host_action_env=PATH=#{env_path} + --define=wasm=disabled ] - # GCC/ld.gold had some issues while building envoy so use clang/lld instead - args << "--config=clang" if OS.linux? + if OS.linux? + # GCC/ld.gold had some issues while building envoy so use clang/lld instead + args << "--config=clang" + + # clang 18 introduced stricter thread safety analysis. Remove once release that supports clang 18 + # https://github.com/envoyproxy/envoy/issues/37911 + args << "--copt=-Wno-thread-safety-reference-return" - # clang 18 introduced stricter thread safety analysis - # https://github.com/envoyproxy/envoy/issues/34233 - args << "--copt=-Wno-thread-safety-reference-return" if DevelopmentTools.clang_version >= 18 + # Workaround to build with Clang 19 until envoy uses newer tcmalloc + # https://github.com/google/tcmalloc/commit/a37da0243b83bd2a7b1b53c187efd4fbf46e6e38 + args << "--copt=-Wno-unused-but-set-variable" + + # Workaround to build with Clang 19 until envoy uses newer grpc + # https://github.com/grpc/grpc/commit/e55f69cedd0ef7344e0bcb64b5ec9205e6aa4f04 + args << "--copt=-Wno-missing-template-arg-list-after-template-kw" + end # Write the current version SOURCE_VERSION. system "python3", "tools/github/write_current_source_version.py", "--skip_error_in_git" system Formula["bazelisk"].opt_bin/"bazelisk", "build", *args, "//source/exe:envoy-static.stripped" bin.install "bazel-bin/source/exe/envoy-static.stripped" => "envoy" - pkgshare.install "configs", "examples" + pkgshare.install "configs" end test do From be82f16f97903ab3f9c7453fc6518fb1c4dc7920 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Tue, 28 Jan 2025 00:42:31 +0000 Subject: [PATCH 2/2] envoy: update 1.33.0 bottle. --- Formula/e/envoy.rb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Formula/e/envoy.rb b/Formula/e/envoy.rb index 6d3781c4b4bf5..5bcf12e956b47 100644 --- a/Formula/e/envoy.rb +++ b/Formula/e/envoy.rb @@ -21,14 +21,12 @@ class Envoy < Formula end bottle do - sha256 cellar: :any_skip_relocation, arm64_sequoia: "eafef893f82016ef51251355c42413d7b8a53460793f44222d9845ab7bcfafd3" - sha256 cellar: :any_skip_relocation, arm64_sonoma: "e91a2e11066c3a0c871fa0d94153fe260d71c12ba7db9ea175b19e960e09d002" - sha256 cellar: :any_skip_relocation, arm64_ventura: "cc2137c9981786830eb65cac9ed6807bfd6a8eebe7764d59a7f621eef4999b9c" - sha256 cellar: :any_skip_relocation, arm64_monterey: "af3de81847a5dc7704ac8d2e7e9b2a320653f362f7824e34aa631675ba1983a3" - sha256 cellar: :any_skip_relocation, sonoma: "878b3d9a46bba9394b6f2b9b910e83d28ea262bcae3cb5ef4eb6dfb29d7c3c5b" - sha256 cellar: :any_skip_relocation, ventura: "a14f5d3f5fef1b495018c639958ec1a5f1737de63f17034e097c92e3b3db9f7f" - sha256 cellar: :any_skip_relocation, monterey: "cd1124efc8af189735d10f2cc4d0a66230905ad5ba2d4c6b7ac02ea544e260be" - sha256 cellar: :any_skip_relocation, x86_64_linux: "3b255d9a8e2d3a99ca8049bac12ba2a094a5b21d7685f77b69b8435914f97ab4" + sha256 cellar: :any_skip_relocation, arm64_sequoia: "691cd0a607d8d87f7dfa64976aedcd779d2061d94d0b88b2253f98cfdc898f33" + sha256 cellar: :any_skip_relocation, arm64_sonoma: "494f6f9f2e19abfef167a8c16d6e37a2365046f3a11d798f35dcdc8d4f449760" + sha256 cellar: :any_skip_relocation, arm64_ventura: "ae500a19266c143b27ab88c463a923919692b2767d235bfad61c1f51a37e6a51" + sha256 cellar: :any_skip_relocation, sonoma: "9fc6ababc39170ab0e175cf542955f95e5f927bdcfc53098c1048467847bf388" + sha256 cellar: :any_skip_relocation, ventura: "6e134fd52fad3fdec6293dac2135003ba3e458f0b2737ad16d4a6e544d43eeef" + sha256 cellar: :any_skip_relocation, x86_64_linux: "b56276639ae42c6de00e30caf68e8c29d79565b0cee17a477b1f03ee680ec23d" end depends_on "automake" => :build