Attachment 205199 Details for Bug 238680 – Patch to be applied to devel/bazel to update to 0.27.0

[patch] Patch to be applied to devel/bazel to update to 0.27.0

bazel.diff (text/plain), 2.33 KB, created by Klaus Aehlig on 2019-06-18 09:59:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2019-06-18 09:59:03 UTC

Size: 2.33 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2019-06-17 15:22:47.874758904 +0200
>+++ bazel/Makefile	2019-06-18 11:56:24.497476636 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/bazel/Makefile 502889 2019-05-28 11:31:20Z swills $
> 
> PORTNAME=		bazel
>-DISTVERSION=		0.26.0
>+DISTVERSION=		0.27.0
> CATEGORIES=		devel java
> MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
> DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
>@@ -24,9 +24,9 @@
> # 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=		16
>+FINALRC=		5
> 
>-USES=			shebangfix zip:infozip python
>+USES=			shebangfix zip:infozip python:3.3+
> SHEBANG_REGEX=		.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
> USE_JAVA=		yes
> JAVA_VENDOR=		openjdk
>@@ -53,12 +53,11 @@
> 	${WRKSRC}/src/main/cpp/blaze_util_posix.cc \
> 	${WRKSRC}/src/main/cpp/BUILD
> 	@${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/bazel.bazelrc
>-	@${ECHO_CMD} build --python_path=${PYTHON_CMD} >> ${WRKSRC}/scripts/packages/bazel.bazelrc
> 	@${ECHO_CMD} build --host_javabase=@local_jdk//:jdk >> ${WRKSRC}/scripts/packages/bazel.bazelrc
> 	@${ECHO_CMD} build --action_env=PATH=/bin:/usr/bin/:${LOCALBASE}/bin >> ${WRKSRC}/scripts/packages/bazel.bazelrc
> 	@${REINPLACE_CMD} \
>-	-e 's|\$$command|$$command --python_path=${PYTHON_CMD}|' \
>-	${WRKSRC}/scripts/bootstrap/bootstrap.sh
>+	-e 's|^$PYTHON_BIN=.*$|if [ "%VERSION%" = "3" ] ; then PYTHON_BIN=${PYTHON_CMD}; else \1 ; fi|' \
>+	${WRKSRC}/tools/python/pywrapper_template.txt
> 	@${REINPLACE_CMD} \
> 	-e 's|/usr/bin/env python|${PYTHON_CMD}|' \
> 	${WRKSRC}/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2019-06-17 15:22:47.874758904 +0200
>+++ bazel/distinfo	2019-06-18 11:56:24.493476617 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1558938094
>-SHA256 (bazel-0.26.0rc16-dist.zip) = e7db1cd14b0905f766dfdbf13b802c1d9ebd1c08dd2c646b4216d4d746ada87f
>-SIZE (bazel-0.26.0rc16-dist.zip) = 244629965
>+TIMESTAMP = 1560545499
>+SHA256 (bazel-0.27.0rc5-dist.zip) = 665bac721c3e2630715302c1d952e6c79db365fe69cf36962212d17d27c52df1
>+SIZE (bazel-0.27.0rc5-dist.zip) = 247943537

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 238680: 205199