Attachment #203172 for bug #236813

View | Details | Raw Unified | Return to bug 236813
Collapse All | Expand All

Lines 2-8 Link Here

(-)bazel/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/devel/bazel/Makefile 494080 2019-02-27 19:34:39Z pi $	2	# $FreeBSD: head/devel/bazel/Makefile 494080 2019-02-27 19:34:39Z pi $
3		3
4	PORTNAME= bazel	4	PORTNAME= bazel
5	DISTVERSION= 0.23.0	5	DISTVERSION= 0.24.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 24-30 Link Here
24	# In bazel, a release is always code-wise identical to the final release candidate.	24	# In bazel, a release is always code-wise identical to the final release candidate.
25	# Hence we can also download that one and so have a simple way to also test earlier release	25	# Hence we can also download that one and so have a simple way to also test earlier release
26	# candidates.	26	# candidates.
27	FINALRC= 3	27	FINALRC= 9
28		28
29	USES= shebangfix zip:infozip python	29	USES= shebangfix zip:infozip python
30	SHEBANG_REGEX= .(sh\|txt\|_stub\|stub_.\|bazel\|get_workspace_status\|protobuf_support\|_so)	30	SHEBANG_REGEX= .(sh\|txt\|_stub\|stub_.\|bazel\|get_workspace_status\|protobuf_support\|_so)

Lines 1-3 Link Here

(-)bazel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1551078041	1	TIMESTAMP = 1553283833
2	SHA256 (bazel-0.23.0rc3-dist.zip) = c361c7950ac0f5467f7d34f867758521b02aab794ae063976ba74151dd2120a8	2	SHA256 (bazel-0.24.0rc9-dist.zip) = 6bbef5fcb37a0bc8ed52b5514ff3f4b4e49b7a5e4f2c02d025e5c9e47cbc8ece
3	SIZE (bazel-0.23.0rc3-dist.zip) = 123718901	3	SIZE (bazel-0.24.0rc9-dist.zip) = 174689646




--- tools/jdk/default_java_toolchain.bzl.orig	1980-01-01 00:00:00.000000000 +0000
+++ tools/jdk/default_java_toolchain.bzl	2019-03-04 15:02:00.395888000 +0000
@@ -19,29 +19,6 @@
 ]
 
 JDK9_JVM_OPTS = [

-    "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-
-    # override the javac in the JDK.
-    "--patch-module=java.compiler=$(location @bazel_tools//tools/jdk:java_compiler_jar)",
-    "--patch-module=jdk.compiler=$(location @bazel_tools//tools/jdk:jdk_compiler_jar)",
-
-    # quiet warnings from com.google.protobuf.UnsafeUtil,
-    # see: https://github.com/google/protobuf/issues/3781
-    # and: https://github.com/bazelbuild/bazel/issues/5599
-    "--add-opens=java.base/java.nio=ALL-UNNAMED",
-    "--add-opens=java.base/java.lang=ALL-UNNAMED",
+    "-Xbootclasspath/p:$(location @bazel_tools//third_party/java/jdk/langtools:javac_jar)",
 ]
 
 DEFAULT_JAVACOPTS = [
@@ -74,7 +51,7 @@
         "@bazel_tools//tools/jdk:jdk_compiler_jar",
     ],
     "javac_supports_workers": 1,
-    "jvm_opts": JDK9_JVM_OPTS,

Return to bug 236813

Lines 1-6 Link Here

(-)bazel/files/patch-tools__jdk__default_java_toolchain.bzl (-8 / +7 lines)
1	--- tools/jdk/default_java_toolchain.bzl.orig 1980-01-01 00:00:00.000000000 +0100	1	--- tools/jdk/default_java_toolchain.bzl.orig 1980-01-01 00:00:00.000000000 +0000
2	+++ tools/jdk/default_java_toolchain.bzl 2018-10-30 00:09:06.904725000 +0100	2	+++ tools/jdk/default_java_toolchain.bzl 2019-03-04 15:02:00.395888000 +0000
3	@@ -19,29 +19,7 @@	3	@@ -19,29 +19,6 @@
4	]	4	]
5		5
6	JDK9_JVM_OPTS = [	6	JDK9_JVM_OPTS = [
Lines 19-38 Link Here
19	- "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",	19	- "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
20	-	20	-
21	- # override the javac in the JDK.	21	- # override the javac in the JDK.
22	- "--patch-module=java.compiler=$(location @bazel_tools//third_party/java/jdk/langtools:java_compiler_jar)",	22	- "--patch-module=java.compiler=$(location @bazel_tools//tools/jdk:java_compiler_jar)",
23	- "--patch-module=jdk.compiler=$(location @bazel_tools//third_party/java/jdk/langtools:jdk_compiler_jar)",	23	- "--patch-module=jdk.compiler=$(location @bazel_tools//tools/jdk:jdk_compiler_jar)",
24	-	24	-
25	- # quiet warnings from com.google.protobuf.UnsafeUtil,	25	- # quiet warnings from com.google.protobuf.UnsafeUtil,
26	- # see: https://github.com/google/protobuf/issues/3781	26	- # see: https://github.com/google/protobuf/issues/3781
27	- # and: https://github.com/bazelbuild/bazel/issues/5599	27	- # and: https://github.com/bazelbuild/bazel/issues/5599
28	- "--add-opens=java.base/java.nio=ALL-UNNAMED",	28	- "--add-opens=java.base/java.nio=ALL-UNNAMED",
29	- "--add-opens=java.base/java.lang=ALL-UNNAMED",	29	- "--add-opens=java.base/java.lang=ALL-UNNAMED",
30	+ "-Xbootclasspath/p:$(location @bazel_tools//third_party/java/jdk/langtools:javac_jar)",
31	]	30	]
32		31
33	DEFAULT_JAVACOPTS = [	32	DEFAULT_JAVACOPTS = [
34	@@ -74,7 +52,7 @@	33	@@ -74,7 +51,7 @@
35	"@bazel_tools//third_party/java/jdk/langtools:jdk_compiler_jar",	34	"@bazel_tools//tools/jdk:jdk_compiler_jar",
36	],	35	],
37	"javac_supports_workers": 1,	36	"javac_supports_workers": 1,
38	- "jvm_opts": JDK9_JVM_OPTS,	37	- "jvm_opts": JDK9_JVM_OPTS,