View | Details | Raw Unified | Return to bug 248117
Collapse All | Expand All

(-)bazel/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/devel/bazel/Makefile 539532 2020-06-18 07:31:17Z lwhsu $
2
# $FreeBSD: head/devel/bazel/Makefile 539532 2020-06-18 07:31:17Z lwhsu $
3
3
4
PORTNAME=	bazel
4
PORTNAME=	bazel
5
DISTVERSION=	3.3.0
5
DISTVERSION=	3.4.1
6
CATEGORIES=	devel java
6
CATEGORIES=	devel java
7
MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
7
MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
8
DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
8
DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
Lines 29-35 Link Here
29
# In bazel, a release is always code-wise identical to the final release candidate.
29
# In bazel, a release is always code-wise identical to the final release candidate.
30
# Hence we can also download that one and so have a simple way to also test earlier release
30
# Hence we can also download that one and so have a simple way to also test earlier release
31
# candidates.
31
# candidates.
32
FINALRC=	2
32
FINALRC=	1
33
33
34
SHEBANG_REGEX=	.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
34
SHEBANG_REGEX=	.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
35
USE_JAVA=	yes
35
USE_JAVA=	yes
(-)bazel/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1592333201
1
TIMESTAMP = 1594712709
2
SHA256 (bazel-3.3.0rc2-dist.zip) = 631b585410e3a16d0d61d852b9618dd58ab9ae8fc72db382aa06f6ec7ada7d2f
2
SHA256 (bazel-3.4.1rc1-dist.zip) = de042639ac363090fa5e88fb0d53d4ff587e95114285247de3eddf1230bbd49d
3
SIZE (bazel-3.3.0rc2-dist.zip) = 269153436
3
SIZE (bazel-3.4.1rc1-dist.zip) = 303410674
(-)bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_BazelPythonSemantics.java (-14 / +7 lines)
Lines 1-21 Link Here
1
--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig	2020-03-03 17:09:23 UTC
1
--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java.orig	2020-07-03 15:30:52.313535000 +0200
2
+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
2
+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java	2020-07-03 15:31:54.048865000 +0200
3
@@ -237,15 +237,15 @@ public class BazelPythonSemantics implem
3
@@ -247,9 +247,9 @@
4
         PathFragment shExecutable = ShToolchain.getPathOrError(ruleContext);
4
         PathFragment shExecutable = ShToolchain.getPathOrError(ruleContext);
5
         // TODO(#8685): Remove this special-case handling as part of making the proper shebang a
5
         // TODO(#8685): Remove this special-case handling as part of making the proper shebang a
6
         // property of the Python toolchain configuration.
6
         // property of the Python toolchain configuration.
7
-        String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python";
7
-        String pythonExecutableName = OS.getCurrent() == OS.OPENBSD ? "python3" : "python";
8
+        String pythonExecutable = "%%PYTHON_CMD%%";
8
+        String pythonExecutableName = "%%PYTHON_CMD%%";
9
         // NOTE: keep the following line intact to support nix builds
10
-        String pythonShebang = "#!/usr/bin/env " + pythonExecutableName;
11
+        String pythonShebang = "#!" + pythonExecutableName;
9
         ruleContext.registerAction(
12
         ruleContext.registerAction(
10
             new SpawnAction.Builder()
13
             new SpawnAction.Builder()
11
                 .addInput(zipFile)
14
                 .addInput(zipFile)
12
                 .addOutput(executable)
13
                 .setShellCommand(
14
                     shExecutable,
15
-                    "echo '#!/usr/bin/env "
16
-                        + pythonExecutableName
17
+                    "echo '#!"
18
+                        + pythonExecutable
19
                         + "' | cat - "
20
                         + zipFile.getExecPathString()
21
                         + " > "

Return to bug 248117