Skip to content

bazel: Patch aspect lib to resolve external build issue #30453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions bazel/aspect.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/lib/private/yq.bzl b/lib/private/yq.bzl
index 29ca3d7..c8cd5eb 100644
--- a/lib/private/yq.bzl
+++ b/lib/private/yq.bzl
@@ -71,10 +71,13 @@ def _yq_impl(ctx):

# For split operations, yq outputs files in the same directory so we
# must cd to the correct output dir before executing it
- bin_dir = "/".join([ctx.bin_dir.path, ctx.label.package]) if ctx.label.package else ctx.bin_dir.path
+ bin_dir = ctx.bin_dir.path
+ if ctx.label.workspace_name:
+ bin_dir = "%s/external/%s" % (bin_dir, ctx.label.workspace_name)
+ bin_dir = "/".join([bin_dir, ctx.label.package]) if ctx.label.package else bin_dir
escape_bin_dir = _escape_path(bin_dir)
cmd = "cd {bin_dir} && {yq} {args} {eval_cmd} {expression} {sources} {maybe_out}".format(
- bin_dir = ctx.bin_dir.path + "/" + ctx.label.package,
+ bin_dir = bin_dir,
yq = escape_bin_dir + yq_bin.path,
eval_cmd = "eval" if len(inputs) <= 1 else "eval-all",
args = " ".join(args),
7 changes: 6 additions & 1 deletion bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,12 @@ def envoy_dependencies(skip_targets = []):
patches = ["@envoy//bazel:rules_pkg.patch"],
)
external_http_archive("com_github_aignas_rules_shellcheck")
external_http_archive("aspect_bazel_lib")
external_http_archive(
"aspect_bazel_lib",
patch_args = ["-p1"],
patches = ["@envoy//bazel:aspect.patch"],
)

_com_github_fdio_vpp_vcl()

# Unconditional, since we use this only for compiler-agnostic fuzzing utils.
Expand Down