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

[Li-Wen Hsu]

Author: lwhsu
Date: Sat Jul 29 06:38:32 2017
New Revision: 446868
URL: https://svnweb.freebsd.org/changeset/ports/446868

Log:
  - Update to 0.5.3 [1]
  - Add CLANG38 option [2]
  
  PR:		219838
  Submitted by:	Jov <amutu at amutu.com> [2]
  Approved by:	Klaus Aehlig <aehlig at linta.de> (maintainer) [1]

Added:
  head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt   (contents, props changed)
Deleted:
  head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt
Modified:
  head/devel/bazel/Makefile
  head/devel/bazel/distinfo

Modified: head/devel/bazel/Makefile
==============================================================================
--- head/devel/bazel/Makefile	Sat Jul 29 06:02:24 2017	(r446867)
+++ head/devel/bazel/Makefile	Sat Jul 29 06:38:32 2017	(r446868)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=		bazel
-PORTVERSION=		0.5.2
+PORTVERSION=		0.5.3
 CATEGORIES=		devel java
 MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
 DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
 
-MAINTAINER=		aehlig at linta.de
+MAINTAINER?=		aehlig at linta.de
 COMMENT=		Fast and correct build system
 
 LICENSE=		APACHE20
@@ -32,6 +32,13 @@ JAVA_VERSION=		1.8
 JAVA_BUILD=		yes
 JAVA_RUN=		yes
 
+CONFLICTS_INSTALL?=	bazel-clang38
+
+OPTIONS_DEFINE=	CLANG38
+CLANG38_DESC=	Use clang38 as default crosstool
+CLANG38_BUILD_DEPENDS=	clang38:devel/llvm38
+CLANG38_RUN_DEPENDS=	clang38:devel/llvm38
+
 # 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.
@@ -40,6 +47,10 @@ post-patch:
 	-e "s|\"/etc/bazel.bazelrc\"|\"${ETCDIR}/bazel.bazelrc\"|" \
 	${WRKSRC}/src/main/cpp/blaze_util_posix.cc
 	@${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/debian/bazel.bazelrc
+
+post-patch-CLANG38-on:
+	@${REINPLACE_CMD} -e 's=/usr/lib/clang=${LOCALBASE}/llvm38/lib/clang=' \
+	-e 's=/usr/bin/clang=${LOCALBASE}/bin/clang38=' ${WRKSRC}/tools/cpp/CROSSTOOL
 
 do-build:
 	@${MKDIR} ${WRKDIR}/bazel_tmp

Modified: head/devel/bazel/distinfo
==============================================================================
--- head/devel/bazel/distinfo	Sat Jul 29 06:02:24 2017	(r446867)
+++ head/devel/bazel/distinfo	Sat Jul 29 06:38:32 2017	(r446868)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498170546
-SHA256 (bazel-0.5.2rc4-dist.zip) = 745de087bc29579cd32584d12acec4cc8dfbd4d1c42f5b7336815413ced803f6
-SIZE (bazel-0.5.2rc4-dist.zip) = 100001723
+TIMESTAMP = 1501141783
+SHA256 (bazel-0.5.3rc4-dist.zip) = 41d70a98366256a20ddf0b0f2aab826913cd332d90c4f245b2c2e83a66f3d846
+SIZE (bazel-0.5.3rc4-dist.zip) = 100445883

Added: head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt	Sat Jul 29 06:38:32 2017	(r446868)
@@ -0,0 +1,11 @@
+--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig	2017-07-25 04:58:01 UTC
++++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
+@@ -38,7 +38,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)