Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Dec 2018 21:34:32 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r488456 - head/devel/bazel
Message-ID:  <201812262134.wBQLYWuZ089654@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Wed Dec 26 21:34:31 2018
New Revision: 488456
URL: https://svnweb.freebsd.org/changeset/ports/488456

Log:
  devel/bazel: update to 0.21.0
  
  PR:		234155
  Submitted by:	Klaus Aehlig <aehlig@linta.de> (maintainer)

Modified:
  head/devel/bazel/Makefile   (contents, props changed)
  head/devel/bazel/distinfo   (contents, props changed)

Modified: head/devel/bazel/Makefile
==============================================================================
--- head/devel/bazel/Makefile	Wed Dec 26 21:29:59 2018	(r488455)
+++ head/devel/bazel/Makefile	Wed Dec 26 21:34:31 2018	(r488456)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 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 @@ BUILD_DEPENDS=		bash:shells/bash \
 # 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 @@ EXTRA_PATCHES=	${FILESDIR}/extra-i386_src_BUILD ${FILE
 # 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 @@ do-build:
 	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:

Modified: head/devel/bazel/distinfo
==============================================================================
--- head/devel/bazel/distinfo	Wed Dec 26 21:29:59 2018	(r488455)
+++ head/devel/bazel/distinfo	Wed Dec 26 21:34:31 2018	(r488456)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812262134.wBQLYWuZ089654>