Attachment 218601 Details for Bug 250164 – Patch to update devel/bazel to 3.6.0

[patch] Patch to update devel/bazel to 3.6.0

bazel.diff (text/plain), 7.77 KB, created by Klaus Aehlig on 2020-10-07 21:59:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2020-10-07 21:59:16 UTC

Size: 7.77 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2020-10-07 23:52:06.825525000 +0200
>+++ bazel/Makefile	2020-10-07 23:51:53.352080000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/bazel/Makefile 547436 2020-09-03 11:45:36Z lwhsu $
> 
> PORTNAME=	bazel
>-DISTVERSION=	3.5.0
>+DISTVERSION=	3.6.0
> CATEGORIES=	devel java
> MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
> DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2020-10-07 23:52:06.832821000 +0200
>+++ bazel/distinfo	2020-10-07 23:51:53.352126000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1597999971
>-SHA256 (bazel-3.5.0rc4-dist.zip) = d54edb7f42ce282c05150da4844430644f5eb27483ed685ef0f3b2e13e3e53b3
>-SIZE (bazel-3.5.0rc4-dist.zip) = 307976110
>+TIMESTAMP = 1601660539
>+SHA256 (bazel-3.6.0rc4-dist.zip) = a99e64c5efc3df19595309ec9c7e7bea1ebfba65dd9a351bf2cfead941ae7467
>+SIZE (bazel-3.6.0rc4-dist.zip) = 308423486
>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	2020-10-07 23:52:06.764461000 +0200
>+++ bazel/files/patch-scripts_bootstrap_bootstrap.sh	2020-10-07 23:51:53.321043000 +0200
>@@ -1,11 +1,11 @@
>---- 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 \
>+--- scripts/bootstrap/bootstrap.sh.orig	2020-10-07 21:26:37 UTC
>++++ scripts/bootstrap/bootstrap.sh
>+@@ -33,7 +33,7 @@ fi
>+ 
>+ _BAZEL_ARGS="--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:-}"
>+       --java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
>diff -ruN bazel.orig/files/patch-scripts_bootstrap_buildenv.sh bazel/files/patch-scripts_bootstrap_buildenv.sh
>--- bazel.orig/files/patch-scripts_bootstrap_buildenv.sh	2020-10-07 23:52:06.791260000 +0200
>+++ bazel/files/patch-scripts_bootstrap_buildenv.sh	2020-10-07 23:51:53.321091000 +0200
>@@ -1,6 +1,6 @@
>---- scripts/bootstrap/buildenv.sh.orig	1979-12-31 23:00:00 UTC
>+--- scripts/bootstrap/buildenv.sh.orig	2020-10-07 21:26:37 UTC
> +++ scripts/bootstrap/buildenv.sh
>-@@ -215,7 +215,7 @@ function clear_log() {
>+@@ -230,7 +230,7 @@ function clear_log() {
>    rm -f ${phasefile}
>  }
>  
>diff -ruN bazel.orig/files/patch-src__main__tools__procress-tools-linux.cc bazel/files/patch-src__main__tools__procress-tools-linux.cc
>--- bazel.orig/files/patch-src__main__tools__procress-tools-linux.cc	2020-10-07 23:52:06.818535000 +0200
>+++ bazel/files/patch-src__main__tools__procress-tools-linux.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- src/main/tools/process-tools-linux.cc.orig	2020-06-02 21:33:22.556035000 +0200
>-+++ src/main/tools/process-tools-linux.cc	2020-06-02 21:34:05.346824000 +0200
>-@@ -17,6 +17,7 @@
>- #include <sys/types.h>
>- #include <sys/wait.h>
>- #include <unistd.h>
>-+#include <signal.h>
>- 
>- #include "src/main/tools/process-tools.h"
>- 
>diff -ruN bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java
>--- bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java	2020-10-07 23:52:06.811918000 +0200
>+++ bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java	2020-10-07 23:51:53.351822000 +0200
>@@ -1,6 +1,6 @@
>---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig	2020-07-03 15:30:52.313535000 +0200
>-+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java	2020-07-03 15:31:54.048865000 +0200
>-@@ -247,9 +247,9 @@
>+--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig	1979-12-31 23:00:00 UTC
>++++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
>+@@ -247,9 +247,9 @@ public class BazelPythonSemantics implem
>          PathFragment shExecutable = ShToolchain.getPathOrError(ruleContext);
>          // TODO(#8685): Remove this special-case handling as part of making the proper shebang a
>          // property of the Python toolchain configuration.
>diff -ruN bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt
>--- bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt	2020-10-07 23:52:06.773973000 +0200
>+++ bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt	2020-10-07 23:51:53.351880000 +0200
>@@ -1,6 +1,6 @@
>---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig	2019-11-13 08:37:00 UTC
>+--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig	2020-10-07 21:26:37 UTC
> +++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
>-@@ -52,7 +52,7 @@
>+@@ -58,7 +58,7 @@ if IsWindows() and not HasWindowsExecuta
>  
>  def SearchPath(name):
>    """Finds a file in a given search path."""
>diff -ruN bazel.orig/files/patch-src_main_tools_process-tools-linux.cc bazel/files/patch-src_main_tools_process-tools-linux.cc
>--- bazel.orig/files/patch-src_main_tools_process-tools-linux.cc	1970-01-01 01:00:00.000000000 +0100
>+++ bazel/files/patch-src_main_tools_process-tools-linux.cc	2020-10-07 23:51:53.351932000 +0200
>@@ -0,0 +1,10 @@
>+--- src/main/tools/process-tools-linux.cc.orig	1979-12-31 23:00:00 UTC
>++++ src/main/tools/process-tools-linux.cc
>+@@ -17,6 +17,7 @@
>+ #include <sys/types.h>
>+ #include <sys/wait.h>
>+ #include <unistd.h>
>++#include <signal.h>
>+ 
>+ #include "src/main/tools/process-tools.h"
>+ 
>diff -ruN bazel.orig/files/patch-src_tools_singlejar_port.h bazel/files/patch-src_tools_singlejar_port.h
>--- bazel.orig/files/patch-src_tools_singlejar_port.h	2020-10-07 23:52:06.801739000 +0200
>+++ bazel/files/patch-src_tools_singlejar_port.h	2020-10-07 23:51:53.351983000 +0200
>@@ -1,5 +1,5 @@
>---- src/tools/singlejar/port.h.orig	2018-09-18 16:02:23.430634000 +0200
>-+++ src/tools/singlejar/port.h	2018-09-18 16:03:58.961047000 +0200
>+--- src/tools/singlejar/port.h.orig	1979-12-31 23:00:00 UTC
>++++ src/tools/singlejar/port.h
> @@ -28,6 +28,11 @@
>  #include <sys/types.h>
>  #include <time.h>
>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	2020-10-07 23:52:06.804427000 +0200
>+++ bazel/files/patch-tools__jdk__default_java_toolchain.bzl	2020-10-07 23:51:53.352034000 +0200
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- tools/jdk/default_java_toolchain.bzl.orig	1979-12-31 23:00:00 UTC
>++++ tools/jdk/default_java_toolchain.bzl
>+@@ -21,25 +21,6 @@ JDK8_JVM_OPTS = [
>  ]
>  
>  JDK9_JVM_OPTS = [
>@@ -26,7 +26,7 @@
>  ]
>  
>  DEFAULT_JAVACOPTS = [
>-@@ -63,7 +44,7 @@
>+@@ -63,7 +44,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = {
>      "javac_supports_workers": 1,
>      "jvm_opts": select({
>          "@bazel_tools//src/conditions:openbsd": JDK8_JVM_OPTS,

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 250164: 218569 | 218601