Attachment 216594 Details for Bug 248117 – Patch for devel/bazel to update to 3.4.1

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

bazel.diff (text/plain), 3.53 KB, created by Klaus Aehlig on 2020-07-20 07:18:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2020-07-20 07:18:55 UTC

Size: 3.53 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2020-07-20 09:12:11.099585000 +0200
>+++ bazel/Makefile	2020-07-20 09:12:33.008700000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/bazel/Makefile 539532 2020-06-18 07:31:17Z lwhsu $
> 
> 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 @@
> # 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
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2020-07-20 09:12:11.172453000 +0200
>+++ bazel/distinfo	2020-07-20 09:12:33.010712000 +0200
>@@ -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
>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-07-20 09:12:11.090498000 +0200
>+++ bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java	2020-07-20 09:12:32.968198000 +0200
>@@ -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()
>-                         + " > "

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 248117: 216594