attempt to build bazel-6.4.0, patch relative to https://git.alpinelinux.org/aports@0f8ae18f78b

abuild-bazel-6.4.0.patch

diff --git a/testing/bazel6/0001-Do-not-use-prebuilt-binaries.patch b/testing/bazel6/0001-Do-not-use-prebuilt-binaries.patch
index 58232e4d1ce..32ebced8a68 100644
--- a/testing/bazel6/0001-Do-not-use-prebuilt-binaries.patch
+++ b/testing/bazel6/0001-Do-not-use-prebuilt-binaries.patch
@@ -1,20 +1,20 @@
 diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools
-index a8bb7c7889..bd756ba8a3 100644
+index 0c37719..83e1a50 100755
 --- a/tools/jdk/BUILD.tools
 +++ b/tools/jdk/BUILD.tools
-@@ -162,7 +162,6 @@ alias(
+@@ -193,7 +193,6 @@ alias(
  alias(
      name = "ijar_prebuilt_binary_or_cc_binary",
      actual = select({
 -        "//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
-         "//src/conditions:darwin": ":ijar_prebuilt_binary_darwin",
+         "//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
+         "//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
          "//src/conditions:windows": ":ijar_prebuilt_binary_windows",
-         "//conditions:default": "@remote_java_tools//:ijar_cc_binary",
-@@ -192,7 +191,6 @@ alias(
+@@ -225,7 +224,6 @@ alias(
  alias(
      name = "singlejar_prebuilt_or_cc_binary",
      actual = select({
 -        "//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
-         "//src/conditions:darwin": ":prebuilt_singlejar_darwin",
+         "//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
+         "//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
          "//src/conditions:windows": ":prebuilt_singlejar_windows",
-         "//conditions:default": "@remote_java_tools//:singlejar_cc_bin",
diff --git a/testing/bazel6/0002-Prefer-local_jdk-instead-of-remote_jdk11.patch b/testing/bazel6/0002-Prefer-local_jdk-instead-of-remote_jdk11.patch
index 54848cea90c..d99913f1fc5 100644
--- a/testing/bazel6/0002-Prefer-local_jdk-instead-of-remote_jdk11.patch
+++ b/testing/bazel6/0002-Prefer-local_jdk-instead-of-remote_jdk11.patch
@@ -1,5 +1,5 @@
 diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
-index 8e81e124e9..cccf832d94 100644
+index 8e81e12..cccf832 100755
 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
 +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
 @@ -535,7 +535,7 @@ public class JavaOptions extends FragmentOptions {
@@ -12,10 +12,10 @@ index 8e81e124e9..cccf832d94 100644
        effectTags = {OptionEffectTag.UNKNOWN},
        help = "The Java runtime version used to execute tools during the build")
 diff --git a/tools/jdk/BUILD.tools b/tools/jdk/BUILD.tools
-index bd756ba8a3..bd4c517984 100644
+index 83e1a50..700f55c 100755
 --- a/tools/jdk/BUILD.tools
 +++ b/tools/jdk/BUILD.tools
-@@ -298,7 +298,7 @@ alias(
+@@ -332,7 +332,7 @@ alias(

  alias(
      name = "host_jdk",
@@ -25,37 +25,37 @@ index bd756ba8a3..bd4c517984 100644

  bootclasspath(
 diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
-index 7251e79068..46de360f75 100644
+index 17f450d..9784760 100755
 --- a/tools/jdk/default_java_toolchain.bzl
 +++ b/tools/jdk/default_java_toolchain.bzl
-@@ -84,7 +84,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = dict(
+@@ -95,7 +95,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = dict(
          # Turbine is not a worker and parallel GC is faster for short-lived programs.
          "-XX:+UseParallelGC",
      ],
--    java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
-+    java_runtime = "@local_jdk//:jdk",
+-    java_runtime = Label("//tools/jdk:remote_jdk11"),
++    java_runtime = Label("@local_jdk//:jdk"),
  )

  # The 'vanilla' toolchain is an unsupported alternative to the default.
-@@ -119,9 +119,9 @@ PREBUILT_TOOLCHAIN_CONFIGURATION = dict(
+@@ -130,9 +130,9 @@ PREBUILT_TOOLCHAIN_CONFIGURATION = dict(
          # Turbine is not a worker and parallel GC is faster for short-lived programs.
          "-XX:+UseParallelGC",
      ],
--    ijar = ["@bazel_tools//tools/jdk:ijar_prebuilt_binary"],
--    singlejar = ["@bazel_tools//tools/jdk:prebuilt_singlejar"],
--    java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
-+    ijar = ["@remote_java_tools//:ijar_cc_binary"],
-+    singlejar = ["@remote_java_tools//:singlejar_cc_bin"],
-+    java_runtime = "@local_jdk//:jdk",
+-    ijar = [Label("//tools/jdk:ijar_prebuilt_binary")],
+-    singlejar = [Label("//tools/jdk:prebuilt_singlejar")],
+-    java_runtime = Label("//tools/jdk:remote_jdk11"),
++    ijar = [Label("@remote_java_tools//:ijar_cc_binary")],
++    singlejar = [Label("@remote_java_tools//:singlejar_cc_bin")],
++    java_runtime = Label("@local_jdk//:jdk"),
  )

  # The new toolchain is using all the tools from sources.
-@@ -136,7 +136,7 @@ NONPREBUILT_TOOLCHAIN_CONFIGURATION = dict(
+@@ -147,7 +147,7 @@ NONPREBUILT_TOOLCHAIN_CONFIGURATION = dict(
      ],
-     ijar = ["@remote_java_tools//:ijar_cc_binary"],
-     singlejar = ["@remote_java_tools//:singlejar_cc_bin"],
--    java_runtime = "@bazel_tools//tools/jdk:remote_jdk11",
-+    java_runtime = "@local_jdk//:jdk",
+     ijar = [Label("@remote_java_tools//:ijar_cc_binary")],
+     singlejar = [Label("@remote_java_tools//:singlejar_cc_bin")],
+-    java_runtime = Label("//tools/jdk:remote_jdk11"),
++    java_runtime = Label("@local_jdk//:jdk"),
  )

  def default_java_toolchain(name, configuration = DEFAULT_TOOLCHAIN_CONFIGURATION, toolchain_definition = True, **kwargs):
diff --git a/testing/bazel6/APKBUILD b/testing/bazel6/APKBUILD
index 4dd7c843a8b..f23bdf20d1a 100644
--- a/testing/bazel6/APKBUILD
+++ b/testing/bazel6/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Leon White <badfunkstripe@gmail.com>
 pkgname=bazel6
-pkgver=6.1.0
+pkgver=6.4.0
 pkgrel=0
 pkgdesc="Bazel is an open-source build and test tool"
 url="https://bazel.build/"
@@ -19,10 +19,12 @@ source="
 	0002-Prefer-local_jdk-instead-of-remote_jdk11.patch
 	0003-Make-generate_bash_completion-compatible-with-busybo.patch
 	0004-Use-nojdk-bazel-for-generating-the-bash-completion.patch
+	0005-Fix-cstdit.patch
 "
 builddir="$srcdir/"

 build() {
+	export ABSL_DEFAULT_COPTS='["-D_LARGEFILE64_SOURCE=1", "-D_FILE_OFFSET_BITS=64"]'
 	EMBED_LABEL=$pkgver-$pkgrel \
 	EXTRA_BAZEL_ARGS=--tool_java_runtime_version=local_jdk \
 		./compile.sh
@@ -60,9 +62,10 @@ package() {
 }

 sha512sums="
-222c72b34566229bb96e2936558f5f8078e3999a10af5beaac231d2ada2e7a69444c4174b1f588f8471424c097422faa7a2bc7a402ee78fbd81729f85ba21bfb  bazel-6.1.0-dist.zip
-a18fbeccd595ed86f66557d6cd270ccc2bc9b2736b8f1fc2c79e3fe219e5af836f5b73b211ae31df33af2e7c3097e438e88034ffecea41731b2147fed6ee1bf4  0001-Do-not-use-prebuilt-binaries.patch
-32019e3ef57e00215e1123b40de78328767b16151d885746086494e27f47648d601971528c8df8c6c1c309928b60629417c2fcdcf085badce6a3a5ea7c3aca34  0002-Prefer-local_jdk-instead-of-remote_jdk11.patch
+e16d16d3f665517d0a4d79257c451d002259838c011749e678520639ea8c5a3f2f5309fb8f2070462b8d2f1dd1f9f0c18d233919e4d92871db67ea71f3f0c88d  bazel-6.4.0-dist.zip
+4ccf58479806a3f397a6726f6f0e408781c84cd07c6f969491bf4885e0e6b9d9630d85039fdddabe5e66c722342510499d2717064c0202be46a8b6eebc105f58  0001-Do-not-use-prebuilt-binaries.patch
+e539cc14083036de78d7ed110f2bfcd29c1c9980c7eb5d8216a43f871f7ef677025798a42db7db59bb0689a74dd7ad2cfac2d5fe1cbd7035b080c7d69a66c783  0002-Prefer-local_jdk-instead-of-remote_jdk11.patch
 b0bae27087f8d1da6a455500fc9fb4758ffdeaa27f0b11de720a0607aa3a4d682adfc1286b6385fe53e67296e7af1f61570b6b3093def1e8cee8531c7f4f5f82  0003-Make-generate_bash_completion-compatible-with-busybo.patch
 a102371e03345e62e3ecc181382481563be92246bda08d9a6c24964c35d07301a20ecc32d519a9c9d9a6d0827b6773357f9ac756fa01ae685666100f0413d09b  0004-Use-nojdk-bazel-for-generating-the-bash-completion.patch
+466263e799a9764e158063f2d2b584fcb7e41e7f3d4079153641433ee3ac8ef149ec5563238fec0f3cfa9d21daf0afa2067b66b9829daf50d5cca40c62dddccb  0005-Fix-cstdit.patch
 "