Attachment 178203 Details for Bug 215490 – Patch to update bazel to 0.4.3

[patch] Patch to update bazel to 0.4.3

bazel.diff (text/plain), 4.68 KB, created by Klaus Aehlig on 2016-12-22 12:43:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2016-12-22 12:43:13 UTC

Size: 4.68 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2016-12-22 13:28:24.489392000 +0100
>+++ bazel/Makefile	2016-12-22 13:28:08.678822000 +0100
>@@ -2,10 +2,10 @@
> # $FreeBSD: head/devel/bazel/Makefile 427983 2016-12-06 19:25:23Z pi $
> 
> PORTNAME=		bazel
>-PORTVERSION=		0.4.2r # rc2 of 0.4.2
>+PORTVERSION=		0.4.3
> 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@linta.de
> COMMENT=		Fast and correct build system
>@@ -16,6 +16,11 @@
> 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=		6
>+
> BROKEN_FreeBSD_9=	fails with static_assert expression error in src/main/cpp/util/numbers.cc
> 
> NO_WRKSUBDIR=		YES
>@@ -27,16 +32,26 @@
> 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>
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2016-12-22 13:28:24.489489000 +0100
>+++ bazel/distinfo	2016-12-22 13:28:08.678920000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1480863971
>-SHA256 (bazel-0.4.2rc2-dist.zip) = 8e6f41252abadcdb2cc7a07f910ec4b45fb12c46f0a578672c6a186c7efcdb36
>-SIZE (bazel-0.4.2rc2-dist.zip) = 89321429
>+TIMESTAMP = 1482352307
>+SHA256 (bazel-0.4.3rc6-dist.zip) = aeff47c789bf1ab5b0b2e6ad342c69f95efd4e2b284a755103a9477fa29b763c
>+SIZE (bazel-0.4.3rc6-dist.zip) = 90362416
>diff -ruN bazel.orig/files/patch-src_main_cpp_blaze__util__freebsd.cc bazel/files/patch-src_main_cpp_blaze__util__freebsd.cc
>--- bazel.orig/files/patch-src_main_cpp_blaze__util__freebsd.cc	2016-12-22 13:28:24.489102000 +0100
>+++ bazel/files/patch-src_main_cpp_blaze__util__freebsd.cc	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>---- src/main/cpp/blaze_util_freebsd.cc.orig	1979-12-31 23:00:00 UTC
>-+++ src/main/cpp/blaze_util_freebsd.cc
>-@@ -145,6 +145,9 @@ bool IsSharedLibrary(const string &filen
>- 
>- string GetDefaultHostJavabase() {
>-   // if JAVA_HOME is defined, then use it as default.
>-+  if (getenv("JAVA_HOME") == nullptr) {
>-+    return "/usr/local/openjdk8";
>-+  }
>-   string javahome = getenv("JAVA_HOME");
>-   return !javahome.empty() ? javahome : "/usr/local/openjdk8";
>- }
>diff -ruN bazel.orig/files/patch-src_main_cpp_util_file__platform.h bazel/files/patch-src_main_cpp_util_file__platform.h
>--- bazel.orig/files/patch-src_main_cpp_util_file__platform.h	2016-12-22 13:28:24.489200000 +0100
>+++ bazel/files/patch-src_main_cpp_util_file__platform.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- src/main/cpp/util/file_platform.h.orig	2016-12-05 22:12:53 UTC
>-+++ src/main/cpp/util/file_platform.h
>-@@ -16,6 +16,7 @@
>- #define BAZEL_SRC_MAIN_CPP_UTIL_FILE_PLATFORM_H_
>- 
>- #include <stdint.h>
>-+#include <time.h>
>- 
>- #include <string>
>- 
>diff -ruN bazel.orig/files/patch-third__party_protobuf_3.0.0_BUILD bazel/files/patch-third__party_protobuf_3.0.0_BUILD
>--- bazel.orig/files/patch-third__party_protobuf_3.0.0_BUILD	2016-12-22 13:28:24.489298000 +0100
>+++ bazel/files/patch-third__party_protobuf_3.0.0_BUILD	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- third_party/protobuf/3.0.0/BUILD.orig	1979-12-31 23:00:00 UTC
>-+++ third_party/protobuf/3.0.0/BUILD
>-@@ -87,7 +87,7 @@ COPTS = [
>-     "-Wno-error=unused-variable",
>- ]
>- 
>--LINK_OPTS = ["-lpthread"]
>-+LINK_OPTS = ["-lpthread", "-lm"]
>- 
>- cc_library(
>-     name = "protobuf_lite",
>diff -ruN bazel.orig/pkg-plist bazel/pkg-plist
>--- bazel.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>+++ bazel/pkg-plist	2016-12-22 13:28:08.679116000 +0100
>@@ -0,0 +1,2 @@
>+bin/bazel
>+@sample %%ETCDIR%%/bazel.bazelrc.sample

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 215490: 178203 | 178296 | 178460 | 178683 | 179360