Attachment #206991 for bug #240179

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

Lines 2-8 Link Here

(-)bazel/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/devel/bazel/Makefile 506764 2019-07-16 16:36:32Z swills $	2	# $FreeBSD: head/devel/bazel/Makefile 506764 2019-07-16 16:36:32Z swills $
3		3
4	PORTNAME= bazel	4	PORTNAME= bazel
5	DISTVERSION= 0.28.0	5	DISTVERSION= 0.29.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 26-32 Link Here
26	# In bazel, a release is always code-wise identical to the final release candidate.	26	# In bazel, a release is always code-wise identical to the final release candidate.
27	# Hence we can also download that one and so have a simple way to also test earlier release	27	# Hence we can also download that one and so have a simple way to also test earlier release
28	# candidates.	28	# candidates.
29	FINALRC= 2	29	FINALRC= 8
30		30
31	SHEBANG_REGEX= .(sh\|txt\|_stub\|stub_.\|bazel\|get_workspace_status\|protobuf_support\|_so)	31	SHEBANG_REGEX= .(sh\|txt\|_stub\|stub_.\|bazel\|get_workspace_status\|protobuf_support\|_so)
32	USE_JAVA= yes	32	USE_JAVA= yes

Lines 1-3 Link Here

(-)bazel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1562751385	1	TIMESTAMP = 1566883509
2	SHA256 (bazel-0.28.0rc2-dist.zip) = 1fa0879671c505b07f2186a67e6eba6642d9d90ab8ed996f7c992f59bddb2739	2	SHA256 (bazel-0.29.0rc8-dist.zip) = d812e6fb46540b42fa8546c381f44728d3a27fcd8029faec05a7f8d14cfc7aa1
3	SIZE (bazel-0.28.0rc2-dist.zip) = 256639115	3	SIZE (bazel-0.29.0rc8-dist.zip) = 265744572




--- 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 \
       --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:-}"





--- tools/jdk/default_java_toolchain.bzl.orig	2019-08-06 08:09:07.930962000 +0000
+++ tools/jdk/default_java_toolchain.bzl	2019-08-06 08:16:15.674960000 +0000
@@ -19,25 +19,6 @@
 ]
 
 JDK9_JVM_OPTS = [
-    # In JDK9 we have seen a ~30% slow down in JavaBuilder performance when using
-    # G1 collector and having compact strings enabled.
-    "-XX:+UseParallelOldGC",
-    "-XX:-CompactStrings",
-    # Allow JavaBuilder to access internal javac APIs.
-    "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-    "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",

 ]
 
 DEFAULT_JAVACOPTS = [
@@ -70,7 +51,7 @@
         "@bazel_tools//tools/jdk:jdk_compiler_jar",
     ],
     "javac_supports_workers": 1,

Return to bug 240179

Lines 1-11 Link Here

(-)bazel/files/patch-scripts_bootstrap_bootstrap.sh (-4 / +4 lines)
1	--- scripts/bootstrap/bootstrap.sh.orig 2017-11-11 21:44:20 UTC	1	--- scripts/bootstrap/bootstrap.sh.orig 2019-08-06 08:04:56.534744000 +0000
2	+++ scripts/bootstrap/bootstrap.sh	2	+++ scripts/bootstrap/bootstrap.sh 2019-08-06 08:05:20.598434000 +0000
3	@@ -34,7 +34,7 @@	3	@@ -35,7 +35,7 @@
4	--host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \	4	--host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
5	--spawn_strategy=standalone \	5	--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	${EXTRA_BAZEL_ARGS:-}"	11	${EXTRA_BAZEL_ARGS:-}"
11

Lines 1-13 Link Here

(-)bazel/files/patch-tools__jdk__default_java_toolchain.bzl (-8 / +4 lines)
1	--- tools/jdk/default_java_toolchain.bzl.orig 1980-01-01 00:00:00.000000000 +0000	1	--- tools/jdk/default_java_toolchain.bzl.orig 2019-08-06 08:09:07.930962000 +0000
2	+++ tools/jdk/default_java_toolchain.bzl 2019-03-04 15:02:00.395888000 +0000	2	+++ tools/jdk/default_java_toolchain.bzl 2019-08-06 08:16:15.674960000 +0000
3	@@ -19,29 +19,6 @@	3	@@ -19,25 +19,6 @@
4	]	4	]
5		5
6	JDK9_JVM_OPTS = [	6	JDK9_JVM_OPTS = [
7	- # In JDK9 we have seen a ~30% slow down in JavaBuilder performance when using
8	- # G1 collector and having compact strings enabled.
9	- "-XX:+UseParallelOldGC",
10	- "-XX:-CompactStrings",
11	- # Allow JavaBuilder to access internal javac APIs.	7	- # Allow JavaBuilder to access internal javac APIs.
12	- "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",	8	- "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
13	- "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",	9	- "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
Lines 30-36 Link Here
30	]	26	]
31		27
32	DEFAULT_JAVACOPTS = [	28	DEFAULT_JAVACOPTS = [
33	@@ -74,7 +51,7 @@	29	@@ -70,7 +51,7 @@
34	"@bazel_tools//tools/jdk:jdk_compiler_jar",	30	"@bazel_tools//tools/jdk:jdk_compiler_jar",
35	],	31	],
36	"javac_supports_workers": 1,	32	"javac_supports_workers": 1,