Index: head/devel/bazel/Makefile =================================================================== --- head/devel/bazel/Makefile (revision 542663) +++ head/devel/bazel/Makefile (revision 542664) @@ -1,89 +1,89 @@ # Created by: Klaus Aehlig # $FreeBSD$ PORTNAME= bazel -DISTVERSION= 3.3.0 +DISTVERSION= 3.4.1 CATEGORIES= devel java MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/ DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist MAINTAINER= aehlig@linta.de COMMENT= Fast and correct build system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_aarch64= fails to build: java.lang.OutOfMemoryError: Java heap space 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_11_powerpc64= fails to compile: Action failed to execute: java.io.IOException: Cannot run program /usr/bin/clang BROKEN_FreeBSD_12_powerpc64= fails to compile: Action failed to execute: java.io.IOException: Cannot run program /usr/bin/clang BUILD_DEPENDS= bash:shells/bash \ zip:archivers/zip USES= python:3.3+ shebangfix zip:infozip CONFLICTS_INSTALL= bazel029 # 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= 2 +FINALRC= 1 SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so) USE_JAVA= yes JAVA_VENDOR= openjdk JAVA_VERSION= 1.8 JAVA_BUILD= yes JAVA_RUN= yes NO_WRKSUBDIR= YES # 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.freebsd .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. post-patch: @${REINPLACE_CMD} \ -e "s|/etc/bazel.bazelrc|${ETCDIR}/bazel.bazelrc|" \ ${WRKSRC}/src/main/cpp/BUILD @${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/bazel.bazelrc @${ECHO_CMD} build --host_javabase=@local_jdk//:jdk >> ${WRKSRC}/scripts/packages/bazel.bazelrc @${ECHO_CMD} build --action_env=PATH=/bin:/usr/bin/:${LOCALBASE}/bin >> ${WRKSRC}/scripts/packages/bazel.bazelrc @${REINPLACE_CMD} \ -e 's|^\(PYTHON_BIN=.*\)|if [ "%VERSION%" = "3" ] ; then PYTHON_BIN=${PYTHON_CMD}; else \1 ; fi|' \ ${WRKSRC}/tools/python/pywrapper_template.txt @${REINPLACE_CMD} \ -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \ ${WRKSRC}/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java do-build: @${MKDIR} ${WRKDIR}/bazel_tmp (if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \ then SOURCE_DATE_EPOCH=`grep TIMESTAMP ${DISTINFO_FILE} \ | ${SED} -e 's/[^0-9]//g'`; \ fi ; \ cd ${WRKSRC} && \ ${SETENV} BAZEL_SH=${LOCALBASE}/bin/bash \ TMPDIR=${WRKDIR}/bazel_tmp \ EMBED_LABEL='${PORTVERSION}' \ PATH=${LOCALBASE}/bin:$$PATH \ SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \ EXTRA_BAZEL_ARGS=--host_javabase=@local_jdk//:jdk \ ${LOCALBASE}/bin/bash ./compile.sh) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/scripts/packages/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample .include Index: head/devel/bazel/distinfo =================================================================== --- head/devel/bazel/distinfo (revision 542663) +++ head/devel/bazel/distinfo (revision 542664) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592333201 -SHA256 (bazel-3.3.0rc2-dist.zip) = 631b585410e3a16d0d61d852b9618dd58ab9ae8fc72db382aa06f6ec7ada7d2f -SIZE (bazel-3.3.0rc2-dist.zip) = 269153436 +TIMESTAMP = 1594712709 +SHA256 (bazel-3.4.1rc1-dist.zip) = de042639ac363090fa5e88fb0d53d4ff587e95114285247de3eddf1230bbd49d +SIZE (bazel-3.4.1rc1-dist.zip) = 303410674 Index: head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java =================================================================== --- head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java (revision 542663) +++ head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java (revision 542664) @@ -1,21 +1,14 @@ ---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig 2020-03-03 17:09:23 UTC -+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java -@@ -237,15 +237,15 @@ public class BazelPythonSemantics implem +--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig 2020-07-03 15:30:52.313535000 +0200 ++++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-07-03 15:31:54.048865000 +0200 +@@ -247,9 +247,9 @@ PathFragment shExecutable = ShToolchain.getPathOrError(ruleContext); // TODO(#8685): Remove this special-case handling as part of making the proper shebang a // property of the Python toolchain configuration. - String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python"; -+ String pythonExecutable = "%%PYTHON_CMD%%"; ++ String pythonExecutableName = "%%PYTHON_CMD%%"; + // NOTE: keep the following line intact to support nix builds +- String pythonShebang = "#!/usr/bin/env " + pythonExecutableName; ++ String pythonShebang = "#!" + pythonExecutableName; ruleContext.registerAction( new SpawnAction.Builder() .addInput(zipFile) - .addOutput(executable) - .setShellCommand( - shExecutable, -- "echo '#!/usr/bin/env " -- + pythonExecutableName -+ "echo '#!" -+ + pythonExecutable - + "' | cat - " - + zipFile.getExecPathString() - + " > "