-
Notifications
You must be signed in to change notification settings - Fork 330
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update protobuf to v29 – see https://protobuf.dev/news/v29/ - Remove incompatible flag overrides that are now on-by-default in Bazel
- Loading branch information
Showing
17 changed files
with
215 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
7.4.1rc2 | ||
8.0.0rc8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
# We don't use bzlmod at this time, but bazel 8 still expects us to have a MODULE.bazel file. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT | ||
|
||
load("@//:build/http.bzl", "http_archive") | ||
|
||
TAG_NAME = "0.0.17" | ||
URL = "https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz" | ||
STRIP_PREFIX = "rules_cc-0.0.17" | ||
SHA256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1" | ||
TYPE = "tgz" | ||
|
||
def dep_rules_cc(): | ||
http_archive( | ||
name = "rules_cc", | ||
url = URL, | ||
strip_prefix = STRIP_PREFIX, | ||
type = TYPE, | ||
sha256 = SHA256, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT | ||
|
||
load("@//:build/http.bzl", "http_archive") | ||
|
||
TAG_NAME = "v0.3.0" | ||
URL = "https://github.com/bazelbuild/rules_shell/releases/download/v0.3.0/rules_shell-v0.3.0.tar.gz" | ||
STRIP_PREFIX = "rules_shell-0.3.0" | ||
SHA256 = "d8cd4a3a91fc1dc68d4c7d6b655f09def109f7186437e3f50a9b60ab436a0c53" | ||
TYPE = "tgz" | ||
|
||
def dep_rules_shell(): | ||
http_archive( | ||
name = "rules_shell", | ||
url = URL, | ||
strip_prefix = STRIP_PREFIX, | ||
type = TYPE, | ||
sha256 = SHA256, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Felix Hanau <[email protected]> | ||
Date: Sat, 23 Nov 2024 22:07:46 -0500 | ||
Subject: Support Bazel 8 | ||
|
||
|
||
diff --git a/lib/private/bats.bzl b/lib/private/bats.bzl | ||
index 65de719a73114c24f837446d35c7a530adb47e94..c71aef825c5d020566abd800f77ab00fa335e200 100644 | ||
--- a/lib/private/bats.bzl | ||
+++ b/lib/private/bats.bzl | ||
@@ -102,7 +102,7 @@ bats_test = rule( | ||
}, | ||
toolchains = [ | ||
"@aspect_bazel_lib//lib:bats_toolchain_type", | ||
- "@bazel_tools//tools/sh:toolchain_type", | ||
+ "@rules_shell//shell:toolchain_type", | ||
], | ||
test = True, | ||
) | ||
diff --git a/lib/windows_utils.bzl b/lib/windows_utils.bzl | ||
index 30a81fed92d17d7eff4ddd0e96179f3001923712..f0af1fb8397f83773af8883049f093928323c668 100644 | ||
--- a/lib/windows_utils.bzl | ||
+++ b/lib/windows_utils.bzl | ||
@@ -70,7 +70,7 @@ exit /b 0 | ||
def create_windows_native_launcher_script(ctx, shell_script): | ||
"""Create a Windows Batch file to launch the given shell script. | ||
|
||
- The rule should specify @bazel_tools//tools/sh:toolchain_type as a required toolchain. | ||
+ The rule should specify @rules_shell//shell:toolchain_type as a required toolchain. | ||
|
||
Args: | ||
ctx: Rule context | ||
@@ -101,7 +101,7 @@ if defined args ( | ||
) | ||
"{bash_bin}" -c "!run_script! !args!" | ||
""".format( | ||
- bash_bin = ctx.toolchains["@bazel_tools//tools/sh:toolchain_type"].path, | ||
+ bash_bin = ctx.toolchains["@rules_shell//shell:toolchain_type"].path, | ||
sh_script = paths.to_rlocation_path(ctx, shell_script), | ||
rlocation_function = BATCH_RLOCATION_FUNCTION, | ||
), |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Felix Hanau <[email protected]> | ||
Date: Fri, 22 Nov 2024 19:19:24 -0500 | ||
Subject: Support Bazel 8 | ||
|
||
|
||
diff --git a/js/private/coverage/merger.bzl b/js/private/coverage/merger.bzl | ||
index b41acfa6330e0b9dfcd71e83277275601ecd8a2a..08c82e0fff27014c5552af17a5423a6e8ca8cccf 100644 | ||
--- a/js/private/coverage/merger.bzl | ||
+++ b/js/private/coverage/merger.bzl | ||
@@ -68,7 +68,7 @@ coverage_merger = rule( | ||
attrs = _ATTRS, | ||
executable = True, | ||
toolchains = [ | ||
- "@bazel_tools//tools/sh:toolchain_type", | ||
+ "@rules_shell//shell:toolchain_type", | ||
"@rules_nodejs//nodejs:toolchain_type", | ||
], | ||
) | ||
diff --git a/js/private/js_binary.bzl b/js/private/js_binary.bzl | ||
index 33e71d92adbd7d9a41575df815db59a1e97f33c2..72147c622ee95d8447ea4896cbf6fdb58149d3b8 100644 | ||
--- a/js/private/js_binary.bzl | ||
+++ b/js/private/js_binary.bzl | ||
@@ -614,7 +614,7 @@ js_binary_lib = struct( | ||
implementation = _js_binary_impl, | ||
toolchains = [ | ||
# TODO: on Windows this toolchain is never referenced | ||
- "@bazel_tools//tools/sh:toolchain_type", | ||
+ "@rules_shell//shell:toolchain_type", | ||
"@rules_nodejs//nodejs:toolchain_type", | ||
] + COPY_FILE_TO_BIN_TOOLCHAINS, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Felix Hanau <[email protected]> | ||
Date: Sat, 23 Nov 2024 22:27:27 -0500 | ||
Subject: Support Bazel 8 | ||
|
||
|
||
diff --git a/tcmalloc/internal/BUILD b/tcmalloc/internal/BUILD | ||
index 3a6c0197d16112d2bc94789c7b9d4ed28f5303b8..66727b3a9fdf38f8b63202ecb550d91cf04100fd 100644 | ||
--- a/tcmalloc/internal/BUILD | ||
+++ b/tcmalloc/internal/BUILD | ||
@@ -14,8 +14,8 @@ | ||
# | ||
# Internal libraries used for the implementation and testing of TCMalloc. | ||
|
||
-load("@rules_cc//cc:defs.bzl", "cc_proto_library") | ||
-load("@rules_proto//proto:defs.bzl", "proto_library") | ||
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") | ||
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") | ||
load("//tcmalloc:copts.bzl", "TCMALLOC_DEFAULT_COPTS") | ||
load("//tcmalloc:variants.bzl", "create_tcmalloc_benchmark") | ||
|
19 changes: 19 additions & 0 deletions
19
patches/v8/0021-bazel-Add-missing-imports-needed-with-Bazel-8.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
From c9688d31cd8e1e8cbb5624f9cee367029d5a728a Mon Sep 17 00:00:00 2001 | ||
From: Felix Hanau <[email protected]> | ||
Date: Sun, 27 Oct 2024 16:49:31 +0000 | ||
Subject: [bazel] Add missing imports needed with Bazel 8 | ||
|
||
|
||
diff --git a/BUILD.bazel b/BUILD.bazel | ||
index 3fa74551420b48f226553ddaa00eb9926a3b009f..5860920e592b2b22d44bbd6a62783fc472e4dcf7 100644 | ||
--- a/BUILD.bazel | ||
+++ b/BUILD.bazel | ||
@@ -3,7 +3,7 @@ | ||
# found in the LICENSE file. | ||
|
||
load("@bazel_skylib//lib:selects.bzl", "selects") | ||
-load("@rules_python//python:defs.bzl", "py_binary") | ||
+load("@rules_python//python:defs.bzl", "py_binary", "py_test") | ||
load("@v8_python_deps//:requirements.bzl", "requirement") | ||
load( | ||
"@v8//:bazel/defs.bzl", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
load("@rules_shell//shell:sh_test.bzl", "sh_test") | ||
|
||
sh_test( | ||
name = "helloworld_compile_test", | ||
size = "medium", | ||
|