From 034f04fda0fc809f96cb4bcd71b2d1f89320d95e Mon Sep 17 00:00:00 2001 From: Leon White Date: Fri, 24 Oct 2025 10:46:28 +0200 Subject: [PATCH] testing/bazel7: upgrade to 7.6.2 --- testing/bazel7/0000-local-jdk.patch | 49 +++++++++++++++ testing/bazel7/0001-off64t-fix.patch | 89 ++++++++++------------------ testing/bazel7/APKBUILD | 13 ++-- 3 files changed, 89 insertions(+), 62 deletions(-) create mode 100644 testing/bazel7/0000-local-jdk.patch diff --git a/testing/bazel7/0000-local-jdk.patch b/testing/bazel7/0000-local-jdk.patch new file mode 100644 index 00000000000..46f1da3e46f --- /dev/null +++ b/testing/bazel7/0000-local-jdk.patch @@ -0,0 +1,49 @@ +diff --git a/.bazelrc b/.bazelrc +index 8514bcc863..ae05d82e4d 100644 +--- a/.bazelrc ++++ b/.bazelrc +@@ -92,3 +92,5 @@ test:ci-windows --test_env=JAVA_HOME + test:ci-windows --test_env=TEST_INSTALL_BASE=C:/b/bazeltest_install_base + test:ci-windows --test_env=REPOSITORY_CACHE=C:/b/bazeltest_repo_cache + test:ci-windows --test_tag_filters=-no_windows,-slow ++ ++common --extra_toolchains=//abuild:non_prebuilt_java_21_toolchain_definition +diff --git a/abuild/BUILD.bazel b/abuild/BUILD.bazel +new file mode 100644 +index 0000000000..23a349134b +--- /dev/null ++++ b/abuild/BUILD.bazel +@@ -0,0 +1,11 @@ ++load("@rules_java//toolchains:default_java_toolchain.bzl", "default_java_toolchain") ++ ++default_java_toolchain( ++ name = "non_prebuilt_java_21_toolchain", ++ header_compiler_direct = "@remote_java_tools//:TurbineDirect", ++ ijar = "//third_party/ijar:ijar", ++ java_runtime = "@local_jdk//:jdk", ++ singlejar = "//src/tools/singlejar:singlejar", ++ source_version = "21", ++ target_version = "21", ++) +diff --git a/scripts/BUILD b/scripts/BUILD +index d25c00a925..715c5ab85f 100644 +--- a/scripts/BUILD ++++ b/scripts/BUILD +@@ -12,7 +12,7 @@ genrule( + outs = ["bazel-complete.bash"], + cmd = " ".join([ + "$(location :generate_bash_completion.sh)", +- "--bazel=$(location //src:bazel)", ++ "--bazel=$(location //src:bazel_nojdk)", + "--output=$@", + "--prepend=$(location bazel-complete-header.bash)", + "--prepend=$(location bazel-complete-template.bash)", +@@ -20,7 +20,7 @@ genrule( + output_to_bindir = 1, + tools = [ + ":generate_bash_completion.sh", +- "//src:bazel", ++ "//src:bazel_nojdk", + ], + visibility = [ + "//scripts/packages:__subpackages__", diff --git a/testing/bazel7/0001-off64t-fix.patch b/testing/bazel7/0001-off64t-fix.patch index 7559199ab60..8e9928af203 100644 --- a/testing/bazel7/0001-off64t-fix.patch +++ b/testing/bazel7/0001-off64t-fix.patch @@ -1,74 +1,49 @@ -diff --git a/.bazelrc b/.bazelrc -index 89de37ca21..2100ccf01c 100644 ---- a/.bazelrc -+++ b/.bazelrc -@@ -92,3 +92,5 @@ test:ci-windows --test_env=JAVA_HOME - test:ci-windows --test_env=TEST_INSTALL_BASE=C:/b/bazeltest_install_base - test:ci-windows --test_env=REPOSITORY_CACHE=C:/b/bazeltest_repo_cache - test:ci-windows --test_tag_filters=-no_windows,-slow -+ -+common --extra_toolchains=//abuild:non_prebuilt_java_21_toolchain_definition diff --git a/MODULE.bazel b/MODULE.bazel -index 49be7bd6d9..90f578fcd0 100644 +index 0a5ea5b7da..7fad4e901c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -30,7 +30,7 @@ bazel_dep(name = "rules_proto", version = "5.3.0-21.7") +@@ -29,7 +29,7 @@ bazel_dep(name = "rules_proto", version = "6.0.0") bazel_dep(name = "rules_jvm_external", version = "6.0") - bazel_dep(name = "rules_python", version = "0.26.0") + bazel_dep(name = "rules_python", version = "0.33.2") bazel_dep(name = "rules_testing", version = "0.6.0") -bazel_dep(name = "googletest", version = "1.14.0", repo_name = "com_google_googletest") +bazel_dep(name = "googletest", version = "1.14.0.bcr.1", repo_name = "com_google_googletest") bazel_dep(name = "with_cfg.bzl", version = "0.2.4") - # TODO(fmeum): Remove the dependency on buildozer after Bazel is built with 7.2.0. -@@ -67,7 +67,7 @@ single_version_override( + # TODO(pcloudy): Add remoteapis and googleapis as Bazel modules in the BCR. +@@ -63,7 +63,7 @@ single_version_override( # The following Bazel modules are not direct dependencies for building Bazel, # but are required for visibility from DIST_ARCHIVE_REPOS in repositories.bzl - bazel_dep(name = "apple_support", version = "1.8.1") + bazel_dep(name = "apple_support", version = "1.23.1") -bazel_dep(name = "abseil-cpp", version = "20230125.1") +bazel_dep(name = "abseil-cpp", version = "20240116.2") bazel_dep(name = "c-ares", version = "1.15.0") bazel_dep(name = "rules_go", version = "0.39.1") bazel_dep(name = "rules_kotlin", version = "1.9.0") -diff --git a/abuild/BUILD.bazel b/abuild/BUILD.bazel -new file mode 100644 -index 0000000000..23a349134b ---- /dev/null -+++ b/abuild/BUILD.bazel -@@ -0,0 +1,11 @@ -+load("@rules_java//toolchains:default_java_toolchain.bzl", "default_java_toolchain") -+ -+default_java_toolchain( -+ name = "non_prebuilt_java_21_toolchain", -+ header_compiler_direct = "@remote_java_tools//:TurbineDirect", -+ ijar = "//third_party/ijar:ijar", -+ java_runtime = "@local_jdk//:jdk", -+ singlejar = "//src/tools/singlejar:singlejar", -+ source_version = "21", -+ target_version = "21", -+) -diff --git a/scripts/BUILD b/scripts/BUILD -index 6f872a4a8d..a6d8ba77b0 100644 ---- a/scripts/BUILD -+++ b/scripts/BUILD -@@ -12,7 +12,7 @@ genrule( - outs = ["bazel-complete.bash"], - cmd = " ".join([ - "$(location :generate_bash_completion.sh)", -- "--bazel=$(location //src:bazel)", -+ "--bazel=$(location //src:bazel_nojdk)", - "--output=$@", - "--prepend=$(location bazel-complete-header.bash)", - "--prepend=$(location bazel-complete-template.bash)", -@@ -20,7 +20,7 @@ genrule( - output_to_bindir = 1, - tools = [ - ":generate_bash_completion.sh", -- "//src:bazel", -+ "//src:bazel_nojdk", - ], - visibility = [ - "//scripts/packages:__subpackages__", +diff --git a/src/main/cpp/archive_utils.h b/src/main/cpp/archive_utils.h +index 18856ab67d..5298a36d6a 100644 +--- a/src/main/cpp/archive_utils.h ++++ b/src/main/cpp/archive_utils.h +@@ -15,6 +15,7 @@ + #ifndef BAZEL_SRC_MAIN_CPP_ARCHIVE_UTILS_H_ + #define BAZEL_SRC_MAIN_CPP_ARCHIVE_UTILS_H_ + ++#include + #include + #include + +diff --git a/src/main/cpp/blaze.h b/src/main/cpp/blaze.h +index 2350fa1449..da24ec8f4d 100644 +--- a/src/main/cpp/blaze.h ++++ b/src/main/cpp/blaze.h +@@ -14,6 +14,7 @@ + #ifndef BAZEL_SRC_MAIN_CPP_BLAZE_H_ + #define BAZEL_SRC_MAIN_CPP_BLAZE_H_ + ++#include + #include + + #include "src/main/cpp/option_processor.h" diff --git a/src/main/native/unix_jni.h b/src/main/native/unix_jni.h index c7a1a73af3..4d757c9696 100644 --- a/src/main/native/unix_jni.h @@ -92,14 +67,14 @@ index c7a1a73af3..4d757c9696 100644 #define portable_stat ::stat #define portable_lstat ::lstat diff --git a/src/main/native/unix_jni_linux.cc b/src/main/native/unix_jni_linux.cc -index 1aa0f252f2..cf9cd4b35b 100644 +index 1aa0f252f2..224fc4c00c 100644 --- a/src/main/native/unix_jni_linux.cc +++ b/src/main/native/unix_jni_linux.cc @@ -13,6 +13,7 @@ // limitations under the License. #include -+#include ++#include #include #include #include diff --git a/testing/bazel7/APKBUILD b/testing/bazel7/APKBUILD index 76962e771dc..a2e4616daf5 100644 --- a/testing/bazel7/APKBUILD +++ b/testing/bazel7/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leon White pkgname=bazel7 -pkgver=7.6.1 -pkgrel=1 +pkgver=7.6.2 +pkgrel=0 pkgdesc="Bazel is an open-source build and test tool" url="https://bazel.build/" arch="x86_64 aarch64" @@ -15,13 +15,15 @@ provides="bazel=$pkgver-r$pkgrel" subpackages="$pkgname-bash-completion" source=" https://github.com/bazelbuild/bazel/releases/download/$pkgver/bazel-$pkgver-dist.zip + 0000-local-jdk.patch 0001-off64t-fix.patch 0002-bash-completion-busybox.patch " builddir="$srcdir/" build() { - EMBED_LABEL=$pkgver-$pkgrel \ + EMBED_LABEL=$pkgver \ + BAZEL_DEV_VERSION_OVERRIDE=$pkgver \ EXTRA_BAZEL_ARGS=--tool_java_runtime_version=local_jdk \ ./compile.sh @@ -57,7 +59,8 @@ package() { } sha512sums=" -a29dc6dac4e31f3a48ae75b023f2e2664a4dddda05b79994ace324617fc7acc0ccf479b5435dce4ad027a06193cb62ceafaac7e67e199a0fcf03a17b0e5f2ded bazel-7.6.1-dist.zip -942bc9b962637da7bf83aa075d5acba84d2cf6e4b928cc1b0f6fec08f112e67ffec645a9e46be5716be17b5a51b8aee8aca6d7451908ff3532552291b1b10777 0001-off64t-fix.patch +46d396179aa9e9f76e0e4f522e0c10a89b623251faf0f2ee8a3f81aff388209f6adab9e45d3cbee26eaa52bfdffce41ff043bb259179c8c3731a053d0a340fd7 bazel-7.6.2-dist.zip +843df794cc85d086f312175c258157e69c110f4a38533e1ed9c4d352f014b828b2465efc3175962a82ac227894c41f68ee3cd63ee225bbaf59cf33c3a3f087d5 0000-local-jdk.patch +1ba32cb5b7d44431257bc85d8785f610467c8a6316a6dadfa31f82c59938e4e2941c24b24a6afc5e89a0e9f00e81ffbfcdbb9325d7f6ba349df03cb7488801ae 0001-off64t-fix.patch b0bae27087f8d1da6a455500fc9fb4758ffdeaa27f0b11de720a0607aa3a4d682adfc1286b6385fe53e67296e7af1f61570b6b3093def1e8cee8531c7f4f5f82 0002-bash-completion-busybox.patch "