diff --git a/Aliases/envoy@1.20 b/Aliases/envoy@1.20 deleted file mode 120000 index 816719609820b..0000000000000 --- a/Aliases/envoy@1.20 +++ /dev/null @@ -1 +0,0 @@ -../Formula/envoy.rb \ No newline at end of file diff --git a/Aliases/envoy@1.19 b/Aliases/envoy@1.21 similarity index 100% rename from Aliases/envoy@1.19 rename to Aliases/envoy@1.21 diff --git a/Formula/envoy.rb b/Formula/envoy.rb index fe531b3ac7430..53d7d938109b7 100644 --- a/Formula/envoy.rb +++ b/Formula/envoy.rb @@ -4,8 +4,8 @@ class Envoy < Formula # Switch to a tarball when the following issue is resolved: # https://github.com/envoyproxy/envoy/issues/2181 url "https://github.com/envoyproxy/envoy.git", - tag: "v1.20.1", - revision: "ea23f47b27464794980c05ab290a3b73d801405e" + tag: "v1.21.0", + revision: "a9d72603c68da3a10a1c0d021d01c7877e6f2a30" license "Apache-2.0" head "https://github.com/envoyproxy/envoy.git", branch: "main" @@ -31,7 +31,7 @@ class Envoy < Formula # GCC added as a test dependency to work around Homebrew issue. Otherwise `brew test` fails. # CompilerSelectionError: envoy cannot be built with any available compilers. depends_on "gcc@9" => [:build, :test] - depends_on "python@3.9" => :build + depends_on "python@3.10" => :build end # https://github.com/envoyproxy/envoy/tree/main/bazel#supported-compiler-versions @@ -49,7 +49,7 @@ def install env_path = if OS.mac? "#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin" else - "#{Formula["python@3.9"].opt_libexec}/bin:#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin" + "#{Formula["python@3.10"].opt_bin}:#{HOMEBREW_PREFIX}/bin:/usr/bin:/bin" end args = %W[ --compilation_mode=opt @@ -60,6 +60,12 @@ def install --host_action_env=PATH=#{env_path} ] + if OS.linux? + # Disable extension `tcp_stats` which requires Linux headers >= 4.6 + # It's a directive with absolute path `#include ` + args << "--//source/extensions/transport_sockets/tcp_stats:enabled=false" + end + system Formula["bazelisk"].opt_bin/"bazelisk", "build", *args, "//source/exe:envoy-static" bin.install "bazel-bin/source/exe/envoy-static" => "envoy" pkgshare.install "configs", "examples"