Attachment #218601 for bug #250164

Lines 2-8 Link Here

(-)bazel/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/devel/bazel/Makefile 547436 2020-09-03 11:45:36Z lwhsu $	2	# $FreeBSD: head/devel/bazel/Makefile 547436 2020-09-03 11:45:36Z lwhsu $
3		3
4	PORTNAME= bazel	4	PORTNAME= bazel
5	DISTVERSION= 3.5.0	5	DISTVERSION= 3.6.0
6	CATEGORIES= devel java	6	CATEGORIES= devel java
7	MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/	7	MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
8	DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist	8	DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist

Lines 1-3 Link Here

(-)bazel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1597999971	1	TIMESTAMP = 1601660539
2	SHA256 (bazel-3.5.0rc4-dist.zip) = d54edb7f42ce282c05150da4844430644f5eb27483ed685ef0f3b2e13e3e53b3	2	SHA256 (bazel-3.6.0rc4-dist.zip) = a99e64c5efc3df19595309ec9c7e7bea1ebfba65dd9a351bf2cfead941ae7467
3	SIZE (bazel-3.5.0rc4-dist.zip) = 307976110	3	SIZE (bazel-3.6.0rc4-dist.zip) = 308423486

Lines 1-11 Link Here

(-)bazel/files/patch-scripts_bootstrap_bootstrap.sh (-6 / +6 lines)
1	--- scripts/bootstrap/bootstrap.sh.orig 2019-08-06 08:04:56.534744000 +0000	1	--- scripts/bootstrap/bootstrap.sh.orig 2020-10-07 21:26:37 UTC
2	+++ scripts/bootstrap/bootstrap.sh 2019-08-06 08:05:20.598434000 +0000	2	+++ scripts/bootstrap/bootstrap.sh
3	@@ -35,7 +35,7 @@	3	@@ -33,7 +33,7 @@ fi
4	--host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \	4
5	--spawn_strategy=standalone \	5	_BAZEL_ARGS="--spawn_strategy=standalone \
6	--nojava_header_compilation \	6	--nojava_header_compilation \
7	- --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \	7	- --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \
8	+ --strategy=Javac=standalone --ignore_unsupported_sandboxing --curses=no \	8	+ --strategy=Javac=standalone --ignore_unsupported_sandboxing --curses=no \
9	--compilation_mode=opt \	9	--compilation_mode=opt \
10	--distdir=derived/distdir \	10	--distdir=derived/distdir \
11	${EXTRA_BAZEL_ARGS:-}"	11	--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \

Lines 1-6 Link Here

(-)bazel/files/patch-scripts_bootstrap_buildenv.sh (-2 / +2 lines)
1	--- scripts/bootstrap/buildenv.sh.orig 1979-12-31 23:00:00 UTC	1	--- scripts/bootstrap/buildenv.sh.orig 2020-10-07 21:26:37 UTC
2	+++ scripts/bootstrap/buildenv.sh	2	+++ scripts/bootstrap/buildenv.sh
3	@@ -215,7 +215,7 @@ function clear_log() {	3	@@ -230,7 +230,7 @@ function clear_log() {
4	rm -f ${phasefile}	4	rm -f ${phasefile}
5	}	5	}
6		6

Lines 1-10 Link Here

(-)bazel/files/patch-src__main__tools__procress-tools-linux.cc (-10 lines)
1	--- src/main/tools/process-tools-linux.cc.orig 2020-06-02 21:33:22.556035000 +0200
2	+++ src/main/tools/process-tools-linux.cc 2020-06-02 21:34:05.346824000 +0200
3	@@ -17,6 +17,7 @@
4	#include <sys/types.h>
5	#include <sys/wait.h>
6	#include <unistd.h>
7	+#include <signal.h>
8
9	#include "src/main/tools/process-tools.h"
10

Lines 1-6 Link Here

(-)bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java (-3 / +3 lines)
1	--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig 2020-07-03 15:30:52.313535000 +0200	1	--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig 1979-12-31 23:00:00 UTC
2	+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java 2020-07-03 15:31:54.048865000 +0200	2	+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
3	@@ -247,9 +247,9 @@	3	@@ -247,9 +247,9 @@ public class BazelPythonSemantics implem
4	PathFragment shExecutable = ShToolchain.getPathOrError(ruleContext);	4	PathFragment shExecutable = ShToolchain.getPathOrError(ruleContext);
5	// TODO(#8685): Remove this special-case handling as part of making the proper shebang a	5	// TODO(#8685): Remove this special-case handling as part of making the proper shebang a
6	// property of the Python toolchain configuration.	6	// property of the Python toolchain configuration.

Lines 1-6 Link Here

(-)bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt (-2 / +2 lines)
1	--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 2019-11-13 08:37:00 UTC	1	--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 2020-10-07 21:26:37 UTC
2	+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt	2	+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
3	@@ -52,7 +52,7 @@	3	@@ -58,7 +58,7 @@ if IsWindows() and not HasWindowsExecuta
4		4
5	def SearchPath(name):	5	def SearchPath(name):
6	"""Finds a file in a given search path."""	6	"""Finds a file in a given search path."""

Line 0 Link Here

(-)bazel/files/patch-src_main_tools_process-tools-linux.cc (+10 lines)
	1	--- src/main/tools/process-tools-linux.cc.orig 1979-12-31 23:00:00 UTC
	2	+++ src/main/tools/process-tools-linux.cc
	3	@@ -17,6 +17,7 @@
	4	#include <sys/types.h>
	5	#include <sys/wait.h>
	6	#include <unistd.h>
	7	+#include <signal.h>
	8
	9	#include "src/main/tools/process-tools.h"
	10

Lines 1-5 Link Here

(-)bazel/files/patch-src_tools_singlejar_port.h (-2 / +2 lines)
1	--- src/tools/singlejar/port.h.orig 2018-09-18 16:02:23.430634000 +0200	1	--- src/tools/singlejar/port.h.orig 1979-12-31 23:00:00 UTC
2	+++ src/tools/singlejar/port.h 2018-09-18 16:03:58.961047000 +0200	2	+++ src/tools/singlejar/port.h
3	@@ -28,6 +28,11 @@	3	@@ -28,6 +28,11 @@
4	#include <sys/types.h>	4	#include <sys/types.h>
5	#include <time.h>	5	#include <time.h>

Lines 1-6 Link Here

(-)bazel/files/patch-tools__jdk__default_java_toolchain.bzl (-4 / +4 lines)
1	--- tools/jdk/default_java_toolchain.bzl.orig 2020-02-14 20:56:31.911758000 +0100	1	--- tools/jdk/default_java_toolchain.bzl.orig 1979-12-31 23:00:00 UTC
2	+++ tools/jdk/default_java_toolchain.bzl 2020-02-14 20:57:09.531875000 +0100	2	+++ tools/jdk/default_java_toolchain.bzl
3	@@ -21,25 +21,6 @@	3	@@ -21,25 +21,6 @@ JDK8_JVM_OPTS = [
4	]	4	]
5		5
6	JDK9_JVM_OPTS = [	6	JDK9_JVM_OPTS = [
Lines 26-32 Link Here
26	]	26	]
27		27
28	DEFAULT_JAVACOPTS = [	28	DEFAULT_JAVACOPTS = [
29	@@ -63,7 +44,7 @@	29	@@ -63,7 +44,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = {
30	"javac_supports_workers": 1,	30	"javac_supports_workers": 1,
31	"jvm_opts": select({	31	"jvm_opts": select({
32	"@bazel_tools//src/conditions:openbsd": JDK8_JVM_OPTS,	32	"@bazel_tools//src/conditions:openbsd": JDK8_JVM_OPTS,

Return to bug 250164