Attachment 192955 Details for Bug 227887 – patch to be applied to devel/bazel to update to 0.13.0

[patch] patch to be applied to devel/bazel to update to 0.13.0

bazel.diff (text/plain), 3.47 KB, created by Klaus Aehlig on 2018-05-01 07:44:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2018-05-01 07:44:40 UTC

Size: 3.47 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2018-05-01 09:42:39.320954000 +0200
>+++ bazel/Makefile	2018-05-01 09:42:48.202691000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/bazel/Makefile 467227 2018-04-13 09:39:04Z krion $
> 
> PORTNAME=		bazel
>-DISTVERSION=		0.12.0
>+DISTVERSION=		0.13.0
> CATEGORIES=		devel java
> MASTER_SITES=		https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/
> DISTNAME=		bazel-${PORTVERSION}rc${FINALRC}-dist
>@@ -22,7 +22,7 @@
> # 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=		3
>+FINALRC=		5
> 
> USES=			shebangfix zip:infozip python
> SHEBANG_REGEX=		.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
>@@ -46,7 +46,7 @@
> .include <bsd.port.pre.mk>
> 
> .if ${ARCH} == "i386"
>-EXTRA_PATCHES=	${FILESDIR}/extra-i386_src_BUILD
>+EXTRA_PATCHES=	${FILESDIR}/extra-i386_src_BUILD ${FILESDIR}/extra-i386_tools_cpp_BUILD.static.freebsd
> .endif
> 
> # Have the location of the system-wide rc file reside ${ETCDIR}.
>diff -ruN bazel.orig/distinfo bazel/distinfo
>--- bazel.orig/distinfo	2018-05-01 09:42:39.327057000 +0200
>+++ bazel/distinfo	2018-05-01 09:42:48.202896000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1523428666
>-SHA256 (bazel-0.12.0rc3-dist.zip) = 49106c9989e297c4c7e906ab796f8006c202c941a90da30f82c5e0e338141af8
>-SIZE (bazel-0.12.0rc3-dist.zip) = 84966489
>+TIMESTAMP = 1525021158
>+SHA256 (bazel-0.13.0rc5-dist.zip) = 92e86b25425bdec624e8ebb9e6b2cc3d814c2e400624c95fd69424792f6b3945
>+SIZE (bazel-0.13.0rc5-dist.zip) = 90102112
>diff -ruN bazel.orig/files/extra-i386_tools_cpp_BUILD.static.freebsd bazel/files/extra-i386_tools_cpp_BUILD.static.freebsd
>--- bazel.orig/files/extra-i386_tools_cpp_BUILD.static.freebsd	1970-01-01 01:00:00.000000000 +0100
>+++ bazel/files/extra-i386_tools_cpp_BUILD.static.freebsd	2018-05-01 09:42:48.202132000 +0200
>@@ -0,0 +1,16 @@
>+--- tools/cpp/BUILD.static.freebsd.orig	2018-04-09 13:54:29.958442000 +0000
>++++ tools/cpp/BUILD.static.freebsd	2018-04-09 13:54:48.383168000 +0000
>+@@ -56,11 +56,11 @@
>+ toolchain(
>+     name = "cc-toolchain-freebsd",
>+     exec_compatible_with = [
>+-        "@bazel_tools//platforms:x86_64",
>++        "@bazel_tools//platforms:x86_32",
>+         "@bazel_tools//platforms:freebsd",
>+     ],
>+     target_compatible_with = [
>+-        "@bazel_tools//platforms:x86_64",
>++        "@bazel_tools//platforms:x86_32",
>+         "@bazel_tools//platforms:freebsd",
>+     ],
>+     toolchain = ":cc-compiler-freebsd",
>diff -ruN bazel.orig/files/patch-third_party_ijar_mapped_file_unix.cc bazel/files/patch-third_party_ijar_mapped_file_unix.cc
>--- bazel.orig/files/patch-third_party_ijar_mapped_file_unix.cc	1970-01-01 01:00:00.000000000 +0100
>+++ bazel/files/patch-third_party_ijar_mapped_file_unix.cc	2018-05-01 09:42:48.202413000 +0200
>@@ -0,0 +1,11 @@
>+--- third_party/ijar/mapped_file_unix.cc.orig	2018-04-09 14:20:44 UTC
>++++ third_party/ijar/mapped_file_unix.cc
>+@@ -110,7 +110,7 @@
>+ 
>+   // Ensure that any buffer overflow in JarStripper will result in
>+   // SIGSEGV or SIGBUS by over-allocating beyond the end of the file.
>+-  size_t mmap_length = std::min(estimated_size + sysconf(_SC_PAGESIZE),
>++  size_t mmap_length = std::min(estimated_size + ((size_t)sysconf(_SC_PAGESIZE)),
>+                                 std::numeric_limits<size_t>::max());
>+   void* mapped = mmap(NULL, mmap_length, PROT_WRITE, MAP_SHARED, fd, 0);
>+   if (mapped == MAP_FAILED) {

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 227887: 192955