Attachment 184809 Details for Bug 219838 – patch to devel/bazel to add CLANG38 option and update to 0.5.3

[patch] patch to devel/bazel to add CLANG38 option and update to 0.5.3

bazel.diff (text/plain), 4.14 KB, created by Klaus Aehlig on 2017-07-28 19:38:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2017-07-28 19:38:56 UTC

Size: 4.14 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2017-07-28 21:31:38.260854000 +0200
>+++ bazel/Makefile	2017-07-28 21:31:56.977572000 +0200
>@@ -2,12 +2,12 @@
> # $FreeBSD: head/devel/bazel/Makefile 445987 2017-07-16 07:15:43Z vanilla $
> 
> 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@linta.de
>+MAINTAINER?=		aehlig@linta.de
> COMMENT=		Fast and correct build system
> 
> LICENSE=		APACHE20
>@@ -32,6 +32,13 @@
> 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.
>@@ -41,6 +48,10 @@
> 	${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
> 	(if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2017-07-28 21:31:38.268814000 +0200
>+++ bazel/distinfo	2017-07-28 21:31:56.977381000 +0200
>@@ -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
>diff -ruN bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt
>--- bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt	1970-01-01 01:00:00.000000000 +0100
>+++ bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt	2017-07-28 21:31:56.990494000 +0200
>@@ -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)
>diff -ruN bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt
>--- bazel.orig/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt	2017-07-28 21:31:38.246483000 +0200
>+++ bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt.orig	2017-03-31 21:28:24 UTC
>-+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
>-@@ -32,7 +32,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)

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 219838: 183287 | 183288 | 183316 | 183320 | 184497 | 184809