Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Dec 2023 10:15:03 GMT
From:      Doug Rabson <dfr@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 9e39f2af50c1 - main - devel/bazel5: fix build on 14.0-RELEASE
Message-ID:  <202312041015.3B4AF3H9076042@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dfr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9e39f2af50c1ab8843f0cb00a245d398a3aeddcf

commit 9e39f2af50c1ab8843f0cb00a245d398a3aeddcf
Author:     Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2023-11-23 10:20:48 +0000
Commit:     Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2023-12-04 10:14:46 +0000

    devel/bazel5: fix build on 14.0-RELEASE
    
    This suppresses warnings about __builtin_offsetof which cause failures
    due to the use of -Werror in some parts of the bazel build.
    
    Approved by:    dch
    Differential Revision: https://reviews.freebsd.org/D42729
---
 devel/bazel5/Makefile                                    |  1 -
 devel/bazel5/files/extra-patch-upb_bazel_build__defs.bzl | 12 ++++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/devel/bazel5/Makefile b/devel/bazel5/Makefile
index cb8d133944b4..0d76ec1ef052 100644
--- a/devel/bazel5/Makefile
+++ b/devel/bazel5/Makefile
@@ -16,7 +16,6 @@ NOT_FOR_ARCHS=	i386
 BROKEN_armv6=	fails to package: cp: bazel: No such file or directory
 BROKEN_armv7=	fails to package: cp: bazel: No such file or directory
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: Action failed to execute: java.io.IOException: Cannot run program /usr/bin/clang
-BROKEN_FreeBSD_14=	__builtin_offsetof is a Clang extension
 
 BUILD_DEPENDS=	bash:shells/bash \
 		zip:archivers/zip
diff --git a/devel/bazel5/files/extra-patch-upb_bazel_build__defs.bzl b/devel/bazel5/files/extra-patch-upb_bazel_build__defs.bzl
index 2bcce02b3eae..f31babd394f2 100644
--- a/devel/bazel5/files/extra-patch-upb_bazel_build__defs.bzl
+++ b/devel/bazel5/files/extra-patch-upb_bazel_build__defs.bzl
@@ -1,5 +1,5 @@
---- bazel/build_defs.bzl.orig	2022-01-20 13:04:32.306692000 +0100
-+++ bazel/build_defs.bzl	2022-01-20 13:05:02.002057000 +0100
+--- bazel/build_defs.bzl.orig	2023-08-27 11:49:04.950868000 +0100
++++ bazel/build_defs.bzl	2023-08-27 11:51:17.441304000 +0100
 @@ -35,6 +35,7 @@
          # "-Wshorten-64-to-32",  # not in GCC (and my Kokoro images doesn't have Clang)
          "-Werror",
@@ -8,3 +8,11 @@
          # copybara:strip_end
      ],
  })
+@@ -49,6 +50,7 @@
+         "-Werror=pedantic",
+         "-Wall",
+         "-Wstrict-prototypes",
++        "-Wno-gnu-offsetof-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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312041015.3B4AF3H9076042>