Attachment 182938 Details for Bug 219575 – Updated patch to update devel/bazel to 0.5.0

[patch] Updated patch to update devel/bazel to 0.5.0

bazel.diff (text/plain), 2.97 KB, created by Klaus Aehlig on 2017-05-26 16:56:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2017-05-26 16:56:15 UTC

Size: 2.97 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2017-05-26 18:47:25.255968000 +0200
>+++ bazel/Makefile	2017-05-26 18:47:35.831928000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/bazel/Makefile 436446 2017-03-18 22:19:27Z cpm $
> 
> PORTNAME=		bazel
>-PORTVERSION=		0.4.5
>+PORTVERSION=		0.5.0
> CATEGORIES=		devel java
> MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
> DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
>@@ -11,7 +11,7 @@
> COMMENT=		Fast and correct build system
> 
> LICENSE=		APACHE20
>-LICENSE_FILE=		${WRKSRC}/LICENSE.txt
>+LICENSE_FILE=		${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=		bash:shells/bash \
> 			zip:archivers/zip
>@@ -19,7 +19,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=		7
>+FINALRC=		9
> 
> NO_WRKSUBDIR=		YES
> USES=			shebangfix zip
>@@ -41,10 +41,15 @@
> 
> do-build:
> 	@${MKDIR} ${WRKDIR}/bazel_tmp
>-	(cd ${WRKSRC} && \
>+	(if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \
>+	  then SOURCE_DATE_EPOCH=`grep TIMESTAMP ${DISTINFO_FILE} \
>+	    | ${SED} -e 's/[^0-9]//g'`; \
>+	fi ; \
>+	cd ${WRKSRC} && \
> 	${SETENV} BAZEL_SH=${LOCALBASE}/bin/bash \
> 	TMPDIR=${WRKDIR}/bazel_tmp \
> 	EMBED_LABEL='${PORTVERSION}' \
>+	SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \
> 	${LOCALBASE}/bin/bash ./compile.sh)
> 
> do-install:
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2017-05-26 18:47:25.261975000 +0200
>+++ bazel/distinfo	2017-05-26 18:47:35.825676000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1489492711
>-SHA256 (bazel-0.4.5rc7-dist.zip) = 493ac443013be7355a99ff226344b30723fbf53ef90ff1f34ea5c86f544b8658
>-SIZE (bazel-0.4.5rc7-dist.zip) = 101503270
>+TIMESTAMP = 1495581096
>+SHA256 (bazel-0.5.0rc9-dist.zip) = b2b2f2e399cd341d91d27f3df0f9862ef0c4c51cc256fd2bda6ca93c0f00e27f
>+SIZE (bazel-0.5.0rc9-dist.zip) = 98166774
>diff -ruN bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt
>--- bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt	1970-01-01 01:00:00.000000000 +0100
>+++ bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt	2017-05-26 18:47:35.848463000 +0200
>@@ -0,0 +1,11 @@
>+--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt.orig	2017-03-31 21:28:24 UTC
>++++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
>+@@ -32,7 +32,7 @@ if IsWindows() and not PYTHON_BINARY.end
>+ 
>+ # Find a file in a given search path.
>+ def SearchPath(name):
>+-  search_path = os.getenv('PATH', os.defpath).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)

Actions: View | Diff

Attachments on bug 219575: 182938