diff -ruN bazel.orig/Makefile bazel/Makefile --- bazel.orig/Makefile 2021-01-21 11:15:04.736013000 +0100 +++ bazel/Makefile 2021-01-21 11:26:04.682371000 +0100 @@ -1,8 +1,8 @@ # Created by: Klaus Aehlig -# $FreeBSD: head/devel/bazel/Makefile 554710 2020-11-09 11:42:33Z mat $ +# $FreeBSD: head/devel/bazel/Makefile 551699 2020-10-08 09:43:04Z rhurlin $ PORTNAME= bazel -DISTVERSION= 3.7.0 +DISTVERSION= 4.0.0 CATEGORIES= devel java MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/ DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist @@ -29,7 +29,7 @@ # In bazel, a release is always code-wise identical to the final release candidate. # Hence we can also download that one and so have a simple way to also test earlier release # candidates. -FINALRC= 1 +FINALRC= 10 SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so) USE_JAVA= yes @@ -43,6 +43,12 @@ # The bazel binary is also a zip archive (extracted by the elf part), it must not be stripped STRIP= +.include + +.if ${ARCH} == "i386" +EXTRA_PATCHES+= ${FILESDIR}/extra-i386_tools_cpp_BUILD.static.bsd +.endif + # Have the location of the system-wide rc file reside ${ETCDIR}. # Also adapt the sample file to disable persistent java workers as they # do not work reliably on FreeBSD. @@ -80,4 +86,4 @@ @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/scripts/packages/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample -.include +.include diff -ruN bazel.orig/distinfo bazel/distinfo --- bazel.orig/distinfo 2021-01-21 11:15:04.751489000 +0100 +++ bazel/distinfo 2021-01-21 11:26:04.682397000 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1602268495 -SHA256 (bazel-3.7.0rc1-dist.zip) = 4fc2708163089860bead209d469828a93f8c3f797da0e11204cb49a78092d341 -SIZE (bazel-3.7.0rc1-dist.zip) = 313645240 +TIMESTAMP = 1610563376 +SHA256 (bazel-4.0.0rc10-dist.zip) = 0c0be85b23dcb83cc42eed0477a765a9de6ba16f85b643ea9e29206767efcd65 +SIZE (bazel-4.0.0rc10-dist.zip) = 274501737