mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-26 05:02:18 +00:00
devel/bazel: Update to 3.6.0
Minor release with several bug fixes and some incompatible changes[1]. [1] https://blog.bazel.build/2020/10/06/bazel-3-6.html Renewed almost all patches under files/ (via make makepatch). PR: 250164 Submitted by: Klaus Aehlig <aehlig@linta.de> (maintainer) Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D26715
This commit is contained in:
parent
49d0cd343e
commit
5f3cda098a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=551699
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
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
|
||||
|
@ -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
|
||||
|
@ -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 \
|
||||
|
@ -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}
|
||||
}
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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.
|
||||
|
@ -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."""
|
||||
|
@ -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"
|
||||
|
@ -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>
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user