View | Details | Raw Unified | Return to bug 219838 | Differences between
and this patch

Collapse All | Expand All

(-)bazel/Makefile (-2 / +13 lines)
Lines 2-13 Link Here
2
# $FreeBSD: head/devel/bazel/Makefile 445987 2017-07-16 07:15:43Z vanilla $
2
# $FreeBSD: head/devel/bazel/Makefile 445987 2017-07-16 07:15:43Z vanilla $
3
3
4
PORTNAME=		bazel
4
PORTNAME=		bazel
5
PORTVERSION=		0.5.2
5
PORTVERSION=		0.5.3
6
CATEGORIES=		devel java
6
CATEGORIES=		devel java
7
MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
7
MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
8
DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
8
DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
9
9
10
MAINTAINER=		aehlig@linta.de
10
MAINTAINER?=		aehlig@linta.de
11
COMMENT=		Fast and correct build system
11
COMMENT=		Fast and correct build system
12
12
13
LICENSE=		APACHE20
13
LICENSE=		APACHE20
Lines 32-37 Link Here
32
JAVA_BUILD=		yes
32
JAVA_BUILD=		yes
33
JAVA_RUN=		yes
33
JAVA_RUN=		yes
34
34
35
CONFLICTS_INSTALL?=	bazel-clang38
36
37
OPTIONS_DEFINE=	CLANG38
38
CLANG38_DESC=	Use clang38 as default crosstool
39
CLANG38_BUILD_DEPENDS=	clang38:devel/llvm38
40
CLANG38_RUN_DEPENDS=	clang38:devel/llvm38
41
35
# Have the location of the system-wide rc file reside ${ETCDIR}.
42
# Have the location of the system-wide rc file reside ${ETCDIR}.
36
# Also adapt the sample file to disable persistent java workers as they
43
# Also adapt the sample file to disable persistent java workers as they
37
# do not work reliably on FreeBSD.
44
# do not work reliably on FreeBSD.
Lines 41-46 Link Here
41
	${WRKSRC}/src/main/cpp/blaze_util_posix.cc
48
	${WRKSRC}/src/main/cpp/blaze_util_posix.cc
42
	@${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/debian/bazel.bazelrc
49
	@${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/debian/bazel.bazelrc
43
50
51
post-patch-CLANG38-on:
52
	@${REINPLACE_CMD} -e 's=/usr/lib/clang=${LOCALBASE}/llvm38/lib/clang=' \
53
	-e 's=/usr/bin/clang=${LOCALBASE}/bin/clang38=' ${WRKSRC}/tools/cpp/CROSSTOOL
54
44
do-build:
55
do-build:
45
	@${MKDIR} ${WRKDIR}/bazel_tmp
56
	@${MKDIR} ${WRKDIR}/bazel_tmp
46
	(if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \
57
	(if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \
(-)bazel/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1498170546
1
TIMESTAMP = 1501141783
2
SHA256 (bazel-0.5.2rc4-dist.zip) = 745de087bc29579cd32584d12acec4cc8dfbd4d1c42f5b7336815413ced803f6
2
SHA256 (bazel-0.5.3rc4-dist.zip) = 41d70a98366256a20ddf0b0f2aab826913cd332d90c4f245b2c2e83a66f3d846
3
SIZE (bazel-0.5.2rc4-dist.zip) = 100001723
3
SIZE (bazel-0.5.3rc4-dist.zip) = 100445883
(-)bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt (+11 lines)
Line 0 Link Here
1
--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig	2017-07-25 04:58:01 UTC
2
+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt
3
@@ -38,7 +38,7 @@ if IsWindows() and not PYTHON_BINARY.end
4
 
5
 # Find a file in a given search path.
6
 def SearchPath(name):
7
-  search_path = os.getenv('PATH', os.defpath).split(os.pathsep)
8
+  search_path = os.getenv('PATH', os.defpath + ":/usr/local/bin").split(os.pathsep)
9
   for directory in search_path:
10
     if directory == '': continue
11
     path = os.path.join(directory, name)
(-)bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt (-11 lines)
Lines 1-11 Link Here
1
--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt.orig	2017-03-31 21:28:24 UTC
2
+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
3
@@ -32,7 +32,7 @@ if IsWindows() and not PYTHON_BINARY.end
4
 
5
 # Find a file in a given search path.
6
 def SearchPath(name):
7
-  search_path = os.getenv('PATH', os.defpath).split(os.pathsep)
8
+  search_path = os.getenv('PATH', os.defpath + ":/usr/local/bin").split(os.pathsep)
9
   for directory in search_path:
10
     if directory == '': continue
11
     path = os.path.join(directory, name)

Return to bug 219838