CVS commit: pkgsrc/devel/bazel

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Dec 15 03:37:01 UTC 2025

Modified Files:
        pkgsrc/devel/bazel: Makefile distinfo
        pkgsrc/devel/bazel/patches:
            patch-third__party_upb_upb-bazel-clang.patch
Added Files:
        pkgsrc/devel/bazel/files: upb-bazel-clang.patch

Log Message:
bazel: hacky method of patching a file to fix build

We would prefer the distfile to include the patches, but since ryoon@
is having trouble regenerating the distfile, introduce a workaround that
fixes the build issue for now.

Make sure the patch is also available in patches/, but it's not used.

PR pkg/59590


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/bazel/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/bazel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/bazel/files/upb-bazel-clang.patch
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/bazel/patches/patch-third__party_upb_upb-bazel-clang.patch

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/bazel/Makefile
diff -u pkgsrc/devel/bazel/Makefile:1.13 pkgsrc/devel/bazel/Makefile:1.14
--- pkgsrc/devel/bazel/Makefile:1.13    Fri May  9 19:37:10 2025
+++ pkgsrc/devel/bazel/Makefile Mon Dec 15 03:37:01 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2025/05/09 19:37:10 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2025/12/15 03:37:01 maya Exp $
 
 # Java project does not work as follows:
 # Error: could not find libjava.so
@@ -58,6 +58,8 @@ MAKE_ENV+=            EXTRA_BAZEL_ARGS=${EXTRA_BAZ
 INSTALLATION_DIRS+=    bin
 
 do-patch:
+       # TEMPORARY EXTRA PATCH until ryoon@ regenerates this distfile
+       ${CP} ${FILESDIR}/upb-bazel-clang.patch ${WRKDIR}/third_party/upb/upb-bazel-clang.patch
        # Do not perform patching. The tarball includes all patches.
 
 pre-configure:

Index: pkgsrc/devel/bazel/distinfo
diff -u pkgsrc/devel/bazel/distinfo:1.3 pkgsrc/devel/bazel/distinfo:1.4
--- pkgsrc/devel/bazel/distinfo:1.3     Mon Jan  1 12:00:58 2024
+++ pkgsrc/devel/bazel/distinfo Mon Dec 15 03:37:01 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2024/01/01 12:00:58 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2025/12/15 03:37:01 maya Exp $
 
 BLAKE2s (bazel-6.4.0-dist-netbsd.tar.gz) = a740abafc058fe6569dd181611fa6521f82dfc8aea26897a6349709842f388dc
 SHA512 (bazel-6.4.0-dist-netbsd.tar.gz) = 0f1edab7673148a4c5d077de0435d05ca8f25abc280416261d05ee2c3a79d028485d60e046babec23757d0b3b90576e9467b2fdc41b6f5c03ce6e805a00cb5ee
@@ -42,7 +42,7 @@ SHA1 (patch-src_tools_singlejar_zip__hea
 SHA1 (patch-third__party_BUILD) = 05d665afc9d1697867102b3737467241f4b2b610
 SHA1 (patch-third__party_abseil-cpp_netbsd-sunos.patch) = c9ff33d2c331312736db8f26c47e8e0b6d7a671f
 SHA1 (patch-third__party_grpc_netbsd-config.patch) = ea14e800a118a3541356c00df5d8edb1aed309fa
-SHA1 (patch-third__party_upb_upb-bazel-clang.patch) = 5a734e360c2a8cd685695adeab06cc26f062ec25
+SHA1 (patch-third__party_upb_upb-bazel-clang.patch) = e0de19a8117adddf2a87fb49acecf089536106d0
 SHA1 (patch-third__party_zstd-jni_zstd-jni.BUILD) = 338d636638b429da3f8a695cc15010174651dd23
 SHA1 (patch-tools_cpp_BUILD.static.bsd) = af9e8cf9f2f069bc4264f4ab3e57aa1e8686946a
 SHA1 (patch-tools_cpp_bsd__cc__toolchain__config.bzl) = febdaa93ed9de3863403fc3c629c7c71df9228d8

Index: pkgsrc/devel/bazel/patches/patch-third__party_upb_upb-bazel-clang.patch
diff -u pkgsrc/devel/bazel/patches/patch-third__party_upb_upb-bazel-clang.patch:1.1 pkgsrc/devel/bazel/patches/patch-third__party_upb_upb-bazel-clang.patch:1.2
--- pkgsrc/devel/bazel/patches/patch-third__party_upb_upb-bazel-clang.patch:1.1 Mon Jan  1 12:01:00 2024
+++ pkgsrc/devel/bazel/patches/patch-third__party_upb_upb-bazel-clang.patch     Mon Dec 15 03:37:01 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-third__party_upb_upb-bazel-clang.patch,v 1.1 2024/01/01 12:01:00 ryoon Exp $
+$NetBSD: patch-third__party_upb_upb-bazel-clang.patch,v 1.2 2025/12/15 03:37:01 maya Exp $
 
 --- third_party/upb/upb-bazel-clang.patch.orig 2023-12-14 08:14:28.011171125 +0000
 +++ third_party/upb/upb-bazel-clang.patch
@@ -18,7 +18,7 @@ $NetBSD: patch-third__party_upb_upb-baze
 +     "-Werror=pedantic",
 +     "-Wall",
 +     "-Wstrict-prototypes",
-++    "-Wno-gnu-offsetof-extensions",
+++    "-Wno-gnu-offsetof-extensions", "-Wno-c23-extensions",
 +     # GCC (at least) emits spurious warnings for this that cannot be fixed
 +     # without introducing redundant initialization (with runtime cost):
 +     #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635

Added files:

Index: pkgsrc/devel/bazel/files/upb-bazel-clang.patch
diff -u /dev/null pkgsrc/devel/bazel/files/upb-bazel-clang.patch:1.1
--- /dev/null   Mon Dec 15 03:37:01 2025
+++ pkgsrc/devel/bazel/files/upb-bazel-clang.patch      Mon Dec 15 03:37:01 2025
@@ -0,0 +1,19 @@
+--- bazel/build_defs.bzl.orig  2023-12-14 07:54:10.464989126 +0000
++++ bazel/build_defs.bzl
+@@ -36,6 +36,8 @@ _DEFAULT_CPPOPTS.extend([
+     # "-Wshorten-64-to-32",  # not in GCC (and my Kokoro images doesn't have Clang)
+     "-Werror",
+     "-Wno-long-long",
++    "-Wno-deprecated-copy",
++    "-Wno-deprecated-builtins",
+ ])
+ _DEFAULT_COPTS.extend([
+     "-std=c99",
+@@ -43,6 +45,7 @@ _DEFAULT_COPTS.extend([
+     "-Werror=pedantic",
+     "-Wall",
+     "-Wstrict-prototypes",
++    "-Wno-gnu-offsetof-extensions", "-Wno-c23-extensions",
+     # GCC (at least) emits spurious warnings for this that cannot be fixed
+     # without introducing redundant initialization (with runtime cost):
+     #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635