Index: head/devel/bazel/Makefile =================================================================== --- head/devel/bazel/Makefile +++ head/devel/bazel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bazel -DISTVERSION= 3.5.0 +DISTVERSION= 3.6.0 CATEGORIES= devel java MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/ DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist Index: head/devel/bazel/distinfo =================================================================== --- head/devel/bazel/distinfo +++ head/devel/bazel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597999971 -SHA256 (bazel-3.5.0rc4-dist.zip) = d54edb7f42ce282c05150da4844430644f5eb27483ed685ef0f3b2e13e3e53b3 -SIZE (bazel-3.5.0rc4-dist.zip) = 307976110 +TIMESTAMP = 1601660539 +SHA256 (bazel-3.6.0rc4-dist.zip) = a99e64c5efc3df19595309ec9c7e7bea1ebfba65dd9a351bf2cfead941ae7467 +SIZE (bazel-3.6.0rc4-dist.zip) = 308423486 Index: head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh =================================================================== --- head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh +++ head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh @@ -1,11 +1,11 @@ ---- scripts/bootstrap/bootstrap.sh.orig 2019-08-06 08:04:56.534744000 +0000 -+++ scripts/bootstrap/bootstrap.sh 2019-08-06 08:05:20.598434000 +0000 -@@ -35,7 +35,7 @@ - --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ - --spawn_strategy=standalone \ +--- scripts/bootstrap/bootstrap.sh.orig 2020-10-07 21:26:37 UTC ++++ scripts/bootstrap/bootstrap.sh +@@ -33,7 +33,7 @@ fi + + _BAZEL_ARGS="--spawn_strategy=standalone \ --nojava_header_compilation \ - --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \ + --strategy=Javac=standalone --ignore_unsupported_sandboxing --curses=no \ --compilation_mode=opt \ --distdir=derived/distdir \ - ${EXTRA_BAZEL_ARGS:-}" + --java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ Index: head/devel/bazel/files/patch-scripts_bootstrap_buildenv.sh =================================================================== --- head/devel/bazel/files/patch-scripts_bootstrap_buildenv.sh +++ head/devel/bazel/files/patch-scripts_bootstrap_buildenv.sh @@ -1,6 +1,6 @@ ---- scripts/bootstrap/buildenv.sh.orig 1979-12-31 23:00:00 UTC +--- scripts/bootstrap/buildenv.sh.orig 2020-10-07 21:26:37 UTC +++ scripts/bootstrap/buildenv.sh -@@ -215,7 +215,7 @@ function clear_log() { +@@ -230,7 +230,7 @@ function clear_log() { rm -f ${phasefile} } Index: head/devel/bazel/files/patch-src__main__tools__procress-tools-linux.cc =================================================================== --- head/devel/bazel/files/patch-src__main__tools__procress-tools-linux.cc +++ head/devel/bazel/files/patch-src__main__tools__procress-tools-linux.cc @@ -1,10 +0,0 @@ ---- src/main/tools/process-tools-linux.cc.orig 2020-06-02 21:33:22.556035000 +0200 -+++ src/main/tools/process-tools-linux.cc 2020-06-02 21:34:05.346824000 +0200 -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #include "src/main/tools/process-tools.h" - 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 +++ head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java @@ -1,6 +1,6 @@ ---- 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 @@ +--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig 1979-12-31 23:00:00 UTC ++++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java +@@ -247,9 +247,9 @@ public class BazelPythonSemantics implem 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. Index: head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt =================================================================== --- head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt +++ head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt @@ -1,6 +1,6 @@ ---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 2019-11-13 08:37:00 UTC +--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 2020-10-07 21:26:37 UTC +++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt -@@ -52,7 +52,7 @@ +@@ -58,7 +58,7 @@ if IsWindows() and not HasWindowsExecuta def SearchPath(name): """Finds a file in a given search path.""" Index: head/devel/bazel/files/patch-src_main_tools_process-tools-linux.cc =================================================================== --- head/devel/bazel/files/patch-src_main_tools_process-tools-linux.cc +++ head/devel/bazel/files/patch-src_main_tools_process-tools-linux.cc @@ -0,0 +1,10 @@ +--- src/main/tools/process-tools-linux.cc.orig 1979-12-31 23:00:00 UTC ++++ src/main/tools/process-tools-linux.cc +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + + #include "src/main/tools/process-tools.h" + Index: head/devel/bazel/files/patch-src_tools_singlejar_port.h =================================================================== --- head/devel/bazel/files/patch-src_tools_singlejar_port.h +++ head/devel/bazel/files/patch-src_tools_singlejar_port.h @@ -1,5 +1,5 @@ ---- src/tools/singlejar/port.h.orig 2018-09-18 16:02:23.430634000 +0200 -+++ src/tools/singlejar/port.h 2018-09-18 16:03:58.961047000 +0200 +--- src/tools/singlejar/port.h.orig 1979-12-31 23:00:00 UTC ++++ src/tools/singlejar/port.h @@ -28,6 +28,11 @@ #include #include Index: head/devel/bazel/files/patch-tools__jdk__default_java_toolchain.bzl =================================================================== --- head/devel/bazel/files/patch-tools__jdk__default_java_toolchain.bzl +++ head/devel/bazel/files/patch-tools__jdk__default_java_toolchain.bzl @@ -1,6 +1,6 @@ ---- tools/jdk/default_java_toolchain.bzl.orig 2020-02-14 20:56:31.911758000 +0100 -+++ tools/jdk/default_java_toolchain.bzl 2020-02-14 20:57:09.531875000 +0100 -@@ -21,25 +21,6 @@ +--- tools/jdk/default_java_toolchain.bzl.orig 1979-12-31 23:00:00 UTC ++++ tools/jdk/default_java_toolchain.bzl +@@ -21,25 +21,6 @@ JDK8_JVM_OPTS = [ ] JDK9_JVM_OPTS = [ @@ -26,7 +26,7 @@ ] DEFAULT_JAVACOPTS = [ -@@ -63,7 +44,7 @@ +@@ -63,7 +44,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = { "javac_supports_workers": 1, "jvm_opts": select({ "@bazel_tools//src/conditions:openbsd": JDK8_JVM_OPTS,