From 786c93ccaae9891338f098a5aba60e9987d78bd3 Mon Sep 17 00:00:00 2001 From: "update-envoy[bot]" <135279899+update-envoy[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 02:25:24 +0000 Subject: [PATCH] bazel: `@envoy_api` should not depend on `@envoy` (#34759) The extra dependency was introduced in 65273b2a9b. pgv.patch is only used by envoy_api, so just moving the file avoids the dependency. Signed-off-by: Eric Anderson Mirrored from https://github.com/envoyproxy/envoy @ 9fde867399cc7fcf97815995f8466f62172b26f6 --- bazel/pgv.patch | 13 +++++++++++++ bazel/repositories.bzl | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 bazel/pgv.patch diff --git a/bazel/pgv.patch b/bazel/pgv.patch new file mode 100644 index 00000000..81e25abf --- /dev/null +++ b/bazel/pgv.patch @@ -0,0 +1,13 @@ +--- a/templates/cc/register.go 2023-06-22 14:25:05.776175085 +0000 ++++ b/templates/cc/register.go 2023-06-22 14:26:33.008090583 +0000 +@@ -116,6 +116,10 @@ + func (fns CCFuncs) methodName(name interface{}) string { + nameStr := fmt.Sprintf("%s", name) + switch nameStr { ++ case "concept": ++ return "concept_" ++ case "requires": ++ return "requires_" + case "const": + return "const_" + case "inline": diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 3e24566a..7813b0ab 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -19,7 +19,7 @@ def api_dependencies(): external_http_archive( name = "com_envoyproxy_protoc_gen_validate", patch_args = ["-p1"], - patches = ["@envoy//bazel:pgv.patch"], + patches = ["@envoy_api//bazel:pgv.patch"], ) external_http_archive( name = "com_google_googleapis",