svn commit: r542664 - in head/devel/bazel: . files
Li-Wen Hsu
lwhsu at FreeBSD.org
Mon Jul 20 19:03:26 UTC 2020
Author: lwhsu
Date: Mon Jul 20 19:03:24 2020
New Revision: 542664
URL: https://svnweb.freebsd.org/changeset/ports/542664
Log:
Update to 3.4.1
PR: 248117
Submitted by: Klaus Aehlig <aehlig at linta.de> (maintainer)
Modified:
head/devel/bazel/Makefile
head/devel/bazel/distinfo
head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java
Modified: head/devel/bazel/Makefile
==============================================================================
--- head/devel/bazel/Makefile Mon Jul 20 18:33:19 2020 (r542663)
+++ head/devel/bazel/Makefile Mon Jul 20 19:03:24 2020 (r542664)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bazel
-DISTVERSION= 3.3.0
+DISTVERSION= 3.4.1
CATEGORIES= devel java
MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist
@@ -29,7 +29,7 @@ CONFLICTS_INSTALL= bazel029
# 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= 1
SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
USE_JAVA= yes
Modified: head/devel/bazel/distinfo
==============================================================================
--- head/devel/bazel/distinfo Mon Jul 20 18:33:19 2020 (r542663)
+++ head/devel/bazel/distinfo Mon Jul 20 19:03:24 2020 (r542664)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592333201
-SHA256 (bazel-3.3.0rc2-dist.zip) = 631b585410e3a16d0d61d852b9618dd58ab9ae8fc72db382aa06f6ec7ada7d2f
-SIZE (bazel-3.3.0rc2-dist.zip) = 269153436
+TIMESTAMP = 1594712709
+SHA256 (bazel-3.4.1rc1-dist.zip) = de042639ac363090fa5e88fb0d53d4ff587e95114285247de3eddf1230bbd49d
+SIZE (bazel-3.4.1rc1-dist.zip) = 303410674
Modified: head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java
==============================================================================
--- head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java Mon Jul 20 18:33:19 2020 (r542663)
+++ head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java Mon Jul 20 19:03:24 2020 (r542664)
@@ -1,21 +1,14 @@
---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig 2020-03-03 17:09:23 UTC
-+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
-@@ -237,15 +237,15 @@ public class BazelPythonSemantics implem
+--- 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 @@
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.
- String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python";
-+ String pythonExecutable = "%%PYTHON_CMD%%";
++ String pythonExecutableName = "%%PYTHON_CMD%%";
+ // NOTE: keep the following line intact to support nix builds
+- String pythonShebang = "#!/usr/bin/env " + pythonExecutableName;
++ String pythonShebang = "#!" + pythonExecutableName;
ruleContext.registerAction(
new SpawnAction.Builder()
.addInput(zipFile)
- .addOutput(executable)
- .setShellCommand(
- shExecutable,
-- "echo '#!/usr/bin/env "
-- + pythonExecutableName
-+ "echo '#!"
-+ + pythonExecutable
- + "' | cat - "
- + zipFile.getExecPathString()
- + " > "
More information about the svn-ports-head
mailing list