svn commit: r433122 - in head/devel/bazel: . files

[Kurt Jaeger]

Author: pi
Date: Thu Feb  2 06:35:27 2017
New Revision: 433122
URL: https://svnweb.freebsd.org/changeset/ports/433122

Log:
  devel/bazel: update 0.4.2r -> 0.4.4
  
  PR:		215490
  Changes:	https://github.com/bazelbuild/bazel/releases
  Submitted by:	Klaus Aehlig <aehlig at linta.de> (maintainer)

Added:
  head/devel/bazel/pkg-plist   (contents, props changed)
Deleted:
  head/devel/bazel/files/patch-src_main_cpp_blaze__util__freebsd.cc
  head/devel/bazel/files/patch-src_main_cpp_util_file__platform.h
  head/devel/bazel/files/patch-third__party_protobuf_3.0.0_BUILD
Modified:
  head/devel/bazel/Makefile
  head/devel/bazel/distinfo
  head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh

Modified: head/devel/bazel/Makefile
==============================================================================
--- head/devel/bazel/Makefile	Thu Feb  2 01:55:22 2017	(r433121)
+++ head/devel/bazel/Makefile	Thu Feb  2 06:35:27 2017	(r433122)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=		bazel
-PORTVERSION=		0.4.2r # rc2 of 0.4.2
+PORTVERSION=		0.4.4
 CATEGORIES=		devel java
-MASTER_SITES=		https://storage.googleapis.com/bazel/0.4.2/rc2/
-DISTNAME=		bazel-0.4.2rc2-dist
+MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
+DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
 
 MAINTAINER=		aehlig at linta.de
 COMMENT=		Fast and correct build system
@@ -16,6 +16,13 @@ LICENSE_FILE=		${WRKSRC}/LICENSE.txt
 BUILD_DEPENDS=		bash:shells/bash \
 			zip:archivers/zip
 
+# 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=		1
+
+BROKEN_FreeBSD_9=	fails with static_assert expression error in src/main/cpp/util/numbers.cc
+
 NO_WRKSUBDIR=		YES
 USES=			shebangfix zip
 SHEBANG_FILES=		${WRKSRC}/tools/cpp/link_dynamic_library.sh
@@ -25,16 +32,26 @@ JAVA_VERSION=		1.8
 JAVA_BUILD=		yes
 JAVA_RUN=		yes
 
-PLIST_FILES=		bin/bazel
+# Have the location of the system-wide rc file reside ${ETCDIR}.
+# Also adapt the sample file to disable persistent java workers as they
+# do not work reliably on FreeBSD.
+post-patch:
+	@${REINPLACE_CMD} \
+	-e "s|\"/etc/bazel.bazelrc\"|\"${ETCDIR}/bazel.bazelrc\"|" \
+	${WRKSRC}/src/main/cpp/workspace_layout.cc
+	@${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/debian/bazel.bazelrc
 
 do-build:
 	@${MKDIR} ${WRKDIR}/bazel_tmp
 	(cd ${WRKSRC} && \
 	${SETENV} BAZEL_SH=${LOCALBASE}/bin/bash \
 	TMPDIR=${WRKDIR}/bazel_tmp \
+	EMBED_LABEL='${PORTVERSION}' \
 	${LOCALBASE}/bin/bash ./compile.sh)
 
 do-install:
-	@${CP} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin
+	${CP} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/scripts/packages/debian/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample
 
 .include <bsd.port.mk>

Modified: head/devel/bazel/distinfo
==============================================================================
--- head/devel/bazel/distinfo	Thu Feb  2 01:55:22 2017	(r433121)
+++ head/devel/bazel/distinfo	Thu Feb  2 06:35:27 2017	(r433122)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480863971
-SHA256 (bazel-0.4.2rc2-dist.zip) = 8e6f41252abadcdb2cc7a07f910ec4b45fb12c46f0a578672c6a186c7efcdb36
-SIZE (bazel-0.4.2rc2-dist.zip) = 89321429
+TIMESTAMP = 1485418133
+SHA256 (bazel-0.4.4rc1-dist.zip) = 573234b67ee4399d8ae1bccb5f57c8943bce8386f83be37fd1f06ffc9a7c4d7f
+SIZE (bazel-0.4.4rc1-dist.zip) = 93030753

Modified: head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh
==============================================================================
--- head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh	Thu Feb  2 01:55:22 2017	(r433121)
+++ head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh	Thu Feb  2 06:35:27 2017	(r433122)
@@ -1,15 +1,15 @@
 --- scripts/bootstrap/bootstrap.sh.orig	1979-12-31 23:00:00 UTC
 +++ scripts/bootstrap/bootstrap.sh
-@@ -39,7 +39,7 @@ if [ "${JAVA_VERSION}" = "1.7" ]; then
- else
-   : ${BAZEL_ARGS:=--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
-         --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \
+@@ -47,7 +47,7 @@ else
+         --host_javabase=$JAVA_HOME \
+         --spawn_strategy=standalone \
+         --nojava_header_compilation \
 -        --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \
 +        --strategy=Javac=standalone --ignore_unsupported_sandboxing \
          --compilation_mode=opt \
          "${EXTRA_BAZEL_ARGS:-}"}
  fi
-@@ -91,7 +91,7 @@ function bootstrap_test() {
+@@ -99,7 +99,7 @@ function bootstrap_test() {
    local BAZEL_BIN=$1
    local BAZEL_SUM=$2
    local BAZEL_TARGET=${3:-src:bazel}

Added: head/devel/bazel/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/bazel/pkg-plist	Thu Feb  2 06:35:27 2017	(r433122)
@@ -0,0 +1,2 @@
+bin/bazel
+ at sample %%ETCDIR%%/bazel.bazelrc.sample