Attachment 209296 Details for Bug 242122 – patch to be applied to devel/bazel to update to 1.2.0

[patch] patch to be applied to devel/bazel to update to 1.2.0

bazel.diff (text/plain), 2.75 KB, created by Klaus Aehlig on 2019-11-20 22:30:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2019-11-20 22:30:45 UTC

Size: 2.75 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2019-11-20 23:24:36.387358000 +0100
>+++ bazel/Makefile	2019-11-20 23:24:44.841983000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/bazel/Makefile 516286 2019-11-02 05:42:34Z yuri $
> 
> PORTNAME=	bazel
>-DISTVERSION=	1.1.0
>+DISTVERSION=	1.2.0
> CATEGORIES=	devel java
> MASTER_SITES=	https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
> DISTNAME=	bazel-${PORTVERSION}rc${FINALRC}-dist
>@@ -28,7 +28,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=	3
> 
> 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	2019-11-20 23:24:36.538758000 +0100
>+++ bazel/distinfo	2019-11-20 23:24:44.841996000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1571381499
>-SHA256 (bazel-1.1.0rc2-dist.zip) = 8764117e0c6048a591e76581374ff5e57b2bbdf2bb1e5a91c961d619706c0fef
>-SIZE (bazel-1.1.0rc2-dist.zip) = 267683104
>+TIMESTAMP = 1574287662
>+SHA256 (bazel-1.2.0rc3-dist.zip) = 9b4a52f0126ef833f0417033d7b1df1de8e2a85a6e2c949fbb5330095ce4404a
>+SIZE (bazel-1.2.0rc3-dist.zip) = 267512846
>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	2019-11-20 23:24:36.187281000 +0100
>+++ bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt	2019-11-20 23:24:44.811721000 +0100
>@@ -1,11 +1,11 @@
>---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig	2017-07-25 04:58:01 UTC
>+--- 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
>-@@ -38,7 +38,7 @@ if IsWindows() and not PYTHON_BINARY.end
>+@@ -52,7 +52,7 @@
>  
>- # Find a file in a given search path.
>  def SearchPath(name):
>+   """Finds a file in a given search path."""
> -  search_path = os.getenv('PATH', os.defpath).split(os.pathsep)
>-+  search_path = os.getenv('PATH', os.defpath + ":/usr/local/bin").split(os.pathsep)
>++  search_path = os.getenv('PATH', os.defpath + ':/usr/local/bin').split(os.pathsep)
>    for directory in search_path:
>-     if directory == '': continue
>-     path = os.path.join(directory, name)
>+     if directory:
>+       path = os.path.join(directory, name)

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 242122: 209296