On 2025-02-19 19:40, Greg Steuck wrote:
I built your patch on arm64 for practice. I noticed that we don't seem
to have the right runtime dependencies:
Oups - I didn't realize that jdk-17 was a bazel dependency, but though it was
a dependency of xla when testing it :-)
With jdk%17 installed there's another weirdness. It wasn't there with
bazel-6.3.2 and is likely to be arm64-only:
% bazel build
WARNING: Invoking Bazel in batch mode since it is not invoked from within a
workspace (below a directory having a WORKSPACE file).
OpenJDK 64-Bit Server VM warning: Options -Xverify:none and -noverify were
deprecated in JDK 13 and will likely be removed in a future release.
java:/tmp/bazel-jni.1850915075858462602/libunix_jni.so: undefined symbol
'blake3_hash_many_neon'
ERROR: The 'build' command is only supported from within a workspace (below a
directory having a WORKSPACE file).
See documentation at https://bazel.build/concepts/build-ref#workspace
Do you have the cycles/hardware to pursue this?
Yeah, seems blake3 support wasn't added before bazel 6.4 ... fixed diff
attached.
Thanks for pointing it out!
cheers,
Volker
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bazel/Makefile,v
diff -u -p -r1.10 Makefile
--- Makefile 21 Dec 2024 11:39:32 -0000 1.10
+++ Makefile 21 Feb 2025 20:32:48 -0000
@@ -3,8 +3,7 @@ BROKEN-sparc64 = libsingle_line_formatte
# ./src/tools/singlejar/mapped_file_posix.inc only supports 64-bit UNIX.
ONLY_FOR_ARCHS = ${LP64_ARCHS}
-VERSION = 6.3.2
-REVISION = 2
+VERSION = 6.5.0
COMMENT = polyglot build tool
HOMEPAGE = https://bazel.build/
@@ -28,7 +27,7 @@ ABSEIL_VER = 20230802.1
DIST_TUPLE = github abseil abseil-cpp ${ABSEIL_VER} .
MODULES = java lang/python
-MODJAVA_VER = 11
+MODJAVA_VER = 17
BUILD_DEPENDS = archivers/zip \
shells/bash
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bazel/distinfo,v
diff -u -p -r1.1 distinfo
--- distinfo 23 Nov 2023 01:04:47 -0000 1.1
+++ distinfo 21 Feb 2025 20:32:48 -0000
@@ -1,4 +1,4 @@
SHA256 (abseil-abseil-cpp-20230802.1.tar.gz) =
mHzpjwLu+6+TDW44qxaqBXNyNNevurLVxOp62+UMKO0=
-SHA256 (bazel-6.3.2-dist.zip) = jNf+rFgZO+K8ukUbpmiKRoJNN8pjWf9Y4NROuY8EKUg=
+SHA256 (bazel-6.5.0-dist.zip) = /InakZQVKJ8p5P8YpeAScOzppv6Dy2CWchi6xKO7PtI=
SIZE (abseil-abseil-cpp-20230802.1.tar.gz) = 2157158
-SIZE (bazel-6.3.2-dist.zip) = 205660977
+SIZE (bazel-6.5.0-dist.zip) = 206369129
Index: patches/patch-distdir_deps_bzl
===================================================================
RCS file: /cvs/ports/devel/bazel/patches/patch-distdir_deps_bzl,v
diff -u -p -r1.2 patch-distdir_deps_bzl
--- patches/patch-distdir_deps_bzl 29 Nov 2023 01:03:34 -0000 1.2
+++ patches/patch-distdir_deps_bzl 21 Feb 2025 20:32:48 -0000
@@ -37,18 +37,16 @@ Index: distdir_deps.bzl
"re2": {
"archive": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz",
"sha256":
"9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e",
-@@ -229,17 +221,24 @@ DIST_DEPS = {
+@@ -229,16 +221,23 @@ DIST_DEPS = {
],
},
"com_google_absl": {
-- "archive": "20211102.0.tar.gz",
-- "sha256":
"dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
+- "archive": "20230802.0.tar.gz",
+- "sha256":
"59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
+ "archive": "20230802.1.tar.gz",
+ "sha256":
"987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed",
"urls": [
--
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz";,
--
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz";,
-+
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.tar.gz";,
+-
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz";,
+
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.1.tar.gz";,
],
+ "patch_args": ["-p0"],
@@ -62,7 +60,7 @@ Index: distdir_deps.bzl
"additional_distfiles",
"test_WORKSPACE_files",
],
-- "strip_prefix": "abseil-cpp-20211102.0",
+- "strip_prefix": "abseil-cpp-20230802.0",
+ "strip_prefix": "abseil-cpp-20230802.1",
},
"zstd-jni": {
Index: patches/patch-src_conditions_BUILD
===================================================================
RCS file: patches/patch-src_conditions_BUILD
diff -N patches/patch-src_conditions_BUILD
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_conditions_BUILD 21 Feb 2025 20:32:48 -0000
@@ -0,0 +1,19 @@
+Index: src/conditions/BUILD
+--- src/conditions/BUILD.orig
++++ src/conditions/BUILD
+@@ -31,6 +31,15 @@ config_setting(
+ )
+
+ config_setting(
++ name = "openbsd_aarch64",
++ constraint_values = [
++ "@platforms//os:openbsd",
++ "@platforms//cpu:aarch64",
++ ],
++ visibility = ["//visibility:public"],
++)
++
++config_setting(
+ name = "linux_arm",
+ constraint_values = [
+ "@platforms//os:linux",
Index: patches/patch-src_conditions_BUILD_tools
===================================================================
RCS file: patches/patch-src_conditions_BUILD_tools
diff -N patches/patch-src_conditions_BUILD_tools
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_conditions_BUILD_tools 21 Feb 2025 20:32:48 -0000
@@ -0,0 +1,19 @@
+Index: src/conditions/BUILD.tools
+--- src/conditions/BUILD.tools.orig
++++ src/conditions/BUILD.tools
+@@ -88,6 +88,15 @@ config_setting(
+ )
+
+ config_setting(
++ name = "openbsd_aarch64",
++ constraint_values = [
++ "@platforms//os:openbsd",
++ "@platforms//cpu:aarch64",
++ ],
++ visibility = ["//visibility:public"],
++)
++
++config_setting(
+ name = "darwin_x86_64",
+ constraint_values = [
+ "@platforms//os:macos",
Index: patches/patch-third_party_blake3_blake3_BUILD
===================================================================
RCS file: patches/patch-third_party_blake3_blake3_BUILD
diff -N patches/patch-third_party_blake3_blake3_BUILD
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-third_party_blake3_blake3_BUILD 21 Feb 2025 20:32:48
-0000
@@ -0,0 +1,13 @@
+Index: third_party/blake3/blake3.BUILD
+--- third_party/blake3/blake3.BUILD.orig
++++ third_party/blake3/blake3.BUILD
+@@ -39,6 +39,9 @@ cc_library(
+ "@bazel_tools//src/conditions:linux_aarch64": [
+ "c/blake3_neon.c",
+ ],
++ "@bazel_tools//src/conditions:openbsd_aarch64": [
++ "c/blake3_neon.c",
++ ],
+ "@bazel_tools//src/conditions:windows_x64": [
+ "c/blake3_avx2_x86-64_windows_msvc.asm",
+ "c/blake3_avx512_x86-64_windows_msvc.asm",
Index: patches/patch-tools_cpp_bsd_cc_toolchain_config_bzl
===================================================================
RCS file:
/cvs/ports/devel/bazel/patches/patch-tools_cpp_bsd_cc_toolchain_config_bzl,v
diff -u -p -r1.1 patch-tools_cpp_bsd_cc_toolchain_config_bzl
--- patches/patch-tools_cpp_bsd_cc_toolchain_config_bzl 23 Nov 2023 01:04:47
-0000 1.1
+++ patches/patch-tools_cpp_bsd_cc_toolchain_config_bzl 21 Feb 2025 20:32:48
-0000
@@ -14,12 +14,3 @@ Index: tools/cpp/bsd_cc_toolchain_config
"-fno-omit-frame-pointer",
],
),
-@@ -160,7 +160,7 @@ def _impl(ctx):
- ),
- flag_set(
- actions = all_cpp_compile_actions +
[ACTION_NAMES.lto_backend],
-- flag_groups = [flag_group(flags = ["-std=c++0x"])],
-+ flag_groups = [flag_group(flags = ["-std=c++14"])],
- ),
- ],
- )
