Attachment 200260 Details for Bug 234155 – patch to be applied to devel/bazel to update to 0.21.0

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

bazel.diff (text/plain), 2.39 KB, created by Klaus Aehlig on 2018-12-19 14:56:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2018-12-19 14:56:14 UTC

Size: 2.39 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2018-12-19 15:48:41.146209771 +0100
>+++ bazel/Makefile	2018-12-19 15:49:08.290097293 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/bazel/Makefile 486596 2018-12-04 12:45:18Z swills $
> 
> PORTNAME=		bazel
>-DISTVERSION=		0.20.0
>+DISTVERSION=		0.21.0
> CATEGORIES=		devel java
> MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
> DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
>@@ -24,7 +24,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=		5
>+FINALRC=		4
> 
> USES=			shebangfix zip:infozip python
> SHEBANG_REGEX=		.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
>@@ -49,10 +49,13 @@
> # do not work reliably on FreeBSD.
> post-patch:
> 	@${REINPLACE_CMD} \
>-	-e "s|\"/etc/bazel.bazelrc\"|\"${ETCDIR}/bazel.bazelrc\"|" \
>-	${WRKSRC}/src/main/cpp/blaze_util_posix.cc
>+	-e "s|/etc/bazel.bazelrc|${ETCDIR}/bazel.bazelrc|" \
>+	${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
>@@ -72,6 +75,7 @@
> 	EMBED_LABEL='${PORTVERSION}' \
> 	PATH=${LOCALBASE}/bin:$$PATH \
> 	SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \
>+	EXTRA_BAZEL_ARGS=--host_javabase=@local_jdk//:jdk \
> 	${LOCALBASE}/bin/bash ./compile.sh)
> 
> do-install:
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2018-12-19 15:48:41.146209771 +0100
>+++ bazel/distinfo	2018-12-19 15:49:08.286097309 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1543820965
>-SHA256 (bazel-0.20.0rc5-dist.zip) = 3679dcadb980b03e78ffdc1f081f0a0a60bf8d97395e91bd93c4ce7b2f804a07
>-SIZE (bazel-0.20.0rc5-dist.zip) = 87599563
>+TIMESTAMP = 1545127179
>+SHA256 (bazel-0.21.0rc4-dist.zip) = 68a9dd9f457a870f4e99342c32da6ca38037ac882ad63b1408930e7ee4b296f9
>+SIZE (bazel-0.21.0rc4-dist.zip) = 88278216

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 234155: 200260