Attachment #212116 for bug #244571

Lines 2-8 Link Here

(-)bazel/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/devel/bazel/Makefile 525657 2020-02-09 13:48:19Z riggs $	2	# $FreeBSD: head/devel/bazel/Makefile 525657 2020-02-09 13:48:19Z riggs $
3		3
4	PORTNAME= bazel	4	PORTNAME= bazel
5	DISTVERSION= 2.1.0	5	DISTVERSION= 2.2.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 29-35 Link Here
29	# In bazel, a release is always code-wise identical to the final release candidate.	29	# In bazel, a release is always code-wise identical to the final release candidate.
30	# Hence we can also download that one and so have a simple way to also test earlier release	30	# Hence we can also download that one and so have a simple way to also test earlier release
31	# candidates.	31	# candidates.
32	FINALRC= 4	32	FINALRC= 1
33		33
34	SHEBANG_REGEX= .(sh\|txt\|_stub\|stub_.\|bazel\|get_workspace_status\|protobuf_support\|_so)	34	SHEBANG_REGEX= .(sh\|txt\|_stub\|stub_.\|bazel\|get_workspace_status\|protobuf_support\|_so)
35	USE_JAVA= yes	35	USE_JAVA= yes

Lines 1-3 Link Here

(-)bazel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1580457560	1	TIMESTAMP = 1581709432
2	SHA256 (bazel-2.1.0rc4-dist.zip) = ac1d9a6189d717ba5aafcbc0745809155d24044df1a69e8de254c5b9182e894b	2	SHA256 (bazel-2.2.0rc1-dist.zip) = a67f282be7ee72181e797efb5ba7cb5fdb203fc883a2649e42e3464f556c73ec
3	SIZE (bazel-2.1.0rc4-dist.zip) = 259805171	3	SIZE (bazel-2.2.0rc1-dist.zip) = 260142631




--- 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 @@
 ]
 
 JDK9_JVM_OPTS = [

 ]
 
 DEFAULT_JAVACOPTS = [
@@ -63,7 +44,7 @@
         "@bazel_tools//tools/jdk:jdk_compiler_jar",
     ],
     "javac_supports_workers": 1,
     "jvm_opts": select({
         "@bazel_tools//src/conditions:openbsd": JDK8_JVM_OPTS,
-        "//conditions:default": JDK9_JVM_OPTS,
+        "//conditions:default": JDK8_JVM_OPTS,
     }),
     "misc": DEFAULT_JAVACOPTS,
     "compatible_javacopts": COMPATIBLE_JAVACOPTS,
     "singlejar": ["@bazel_tools//tools/jdk:singlejar"],

Return to bug 244571

Lines 1-6 Link Here

(-)bazel/files/patch-tools__jdk__default_java_toolchain.bzl (-9 / +9 lines)
1	--- tools/jdk/default_java_toolchain.bzl.orig 2019-08-06 08:09:07.930962000 +0000	1	--- tools/jdk/default_java_toolchain.bzl.orig 2020-02-14 20:56:31.911758000 +0100
2	+++ tools/jdk/default_java_toolchain.bzl 2019-08-06 08:16:15.674960000 +0000	2	+++ tools/jdk/default_java_toolchain.bzl 2020-02-14 20:57:09.531875000 +0100
3	@@ -19,25 +19,6 @@	3	@@ -21,25 +21,6 @@
4	]	4	]
5		5
6	JDK9_JVM_OPTS = [	6	JDK9_JVM_OPTS = [
Lines 26-37 Link Here
26	]	26	]
27		27
28	DEFAULT_JAVACOPTS = [	28	DEFAULT_JAVACOPTS = [
29	@@ -70,7 +51,7 @@	29	@@ -63,7 +44,7 @@
30	"@bazel_tools//tools/jdk:jdk_compiler_jar",
31	],
32	"javac_supports_workers": 1,	30	"javac_supports_workers": 1,
33	- "jvm_opts": JDK9_JVM_OPTS,	31	"jvm_opts": select({
34	+ "jvm_opts": JDK8_JVM_OPTS,	32	"@bazel_tools//src/conditions:openbsd": JDK8_JVM_OPTS,
		33	- "//conditions:default": JDK9_JVM_OPTS,
		34	+ "//conditions:default": JDK8_JVM_OPTS,
		35	}),
35	"misc": DEFAULT_JAVACOPTS,	36	"misc": DEFAULT_JAVACOPTS,
36	"compatible_javacopts": COMPATIBLE_JAVACOPTS,
37	"singlejar": ["@bazel_tools//tools/jdk:singlejar"],	37	"singlejar": ["@bazel_tools//tools/jdk:singlejar"],