Attachment 206991 Details for Bug 240179 – Patch for devel/bazel to update to 0.29.0

[patch] Patch for devel/bazel to update to 0.29.0

bazel.diff (text/plain), 3.59 KB, created by Klaus Aehlig on 2019-08-28 21:56:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2019-08-28 21:56:32 UTC

Size: 3.59 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2019-08-28 23:53:32.135032000 +0200
>+++ bazel/Makefile	2019-08-28 23:53:40.717279000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/bazel/Makefile 506764 2019-07-16 16:36:32Z swills $
> 
> PORTNAME=	bazel
>-DISTVERSION=	0.28.0
>+DISTVERSION=	0.29.0
> CATEGORIES=	devel java
> MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
> DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
>@@ -26,7 +26,7 @@
> # In bazel, a release is always code-wise identical to the final release candidate.
> # Hence we can also download that one and so have a simple way to also test earlier release
> # candidates.
>-FINALRC=	2
>+FINALRC=	8
> 
> SHEBANG_REGEX=	.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
> USE_JAVA=	yes
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2019-08-28 23:53:32.138431000 +0200
>+++ bazel/distinfo	2019-08-28 23:53:40.717495000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1562751385
>-SHA256 (bazel-0.28.0rc2-dist.zip) = 1fa0879671c505b07f2186a67e6eba6642d9d90ab8ed996f7c992f59bddb2739
>-SIZE (bazel-0.28.0rc2-dist.zip) = 256639115
>+TIMESTAMP = 1566883509
>+SHA256 (bazel-0.29.0rc8-dist.zip) = d812e6fb46540b42fa8546c381f44728d3a27fcd8029faec05a7f8d14cfc7aa1
>+SIZE (bazel-0.29.0rc8-dist.zip) = 265744572
>diff -ruN bazel.orig/files/patch-scripts_bootstrap_bootstrap.sh bazel/files/patch-scripts_bootstrap_bootstrap.sh
>--- bazel.orig/files/patch-scripts_bootstrap_bootstrap.sh	2019-08-28 23:53:32.105193000 +0200
>+++ bazel/files/patch-scripts_bootstrap_bootstrap.sh	2019-08-28 23:53:40.694950000 +0200
>@@ -1,11 +1,11 @@
>---- scripts/bootstrap/bootstrap.sh.orig	2017-11-11 21:44:20 UTC
>-+++ scripts/bootstrap/bootstrap.sh
>-@@ -34,7 +34,7 @@
>+--- 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:-}"
>-
>diff -ruN bazel.orig/files/patch-tools__jdk__default_java_toolchain.bzl bazel/files/patch-tools__jdk__default_java_toolchain.bzl
>--- bazel.orig/files/patch-tools__jdk__default_java_toolchain.bzl	2019-08-28 23:53:32.134841000 +0200
>+++ bazel/files/patch-tools__jdk__default_java_toolchain.bzl	2019-08-28 23:53:40.716853000 +0200
>@@ -1,13 +1,9 @@
>---- 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 @@
>+--- 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",
>@@ -30,7 +26,7 @@
>  ]
>  
>  DEFAULT_JAVACOPTS = [
>-@@ -74,7 +51,7 @@
>+@@ -70,7 +51,7 @@
>          "@bazel_tools//tools/jdk:jdk_compiler_jar",
>      ],
>      "javac_supports_workers": 1,

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 240179: 206991