Attachment 185169 Details for Bug 221114 – patch for deve/bazel to fix build on i386

[patch] patch for deve/bazel to fix build on i386

bazel.diff (text/plain), 2.07 KB, created by Klaus Aehlig on 2017-08-08 21:51:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Aehlig

Created: 2017-08-08 21:51:19 UTC

Size: 2.07 KB

patch

obsolete

>diff -ruN bazel.orig/Makefile bazel/Makefile
>--- bazel.orig/Makefile	2017-08-08 23:47:35.089585000 +0200
>+++ bazel/Makefile	2017-08-08 23:47:43.161039000 +0200
>@@ -39,6 +39,12 @@
> CLANG38_BUILD_DEPENDS=	clang38:devel/llvm38
> CLANG38_RUN_DEPENDS=	clang38:devel/llvm38
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == "i386"
>+EXTRA_PATCHES += ${FILESDIR}/extra-i386_src_BUILD
>+.endif
>+
> # 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.
>@@ -71,4 +77,4 @@
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
> 	${INSTALL_DATA} ${WRKSRC}/scripts/packages/debian/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN bazel.orig/files/extra-i386_src_BUILD bazel/files/extra-i386_src_BUILD
>--- bazel.orig/files/extra-i386_src_BUILD	1970-01-01 01:00:00.000000000 +0100
>+++ bazel/files/extra-i386_src_BUILD	2017-08-08 23:47:43.162298000 +0200
>@@ -0,0 +1,32 @@
>+--- src/BUILD.orig	2017-07-31 10:06:21.426927000 +0200
>++++ src/BUILD	2017-07-31 10:06:44.279345000 +0200
>+@@ -179,7 +179,7 @@
>+             "//src/java_tools/singlejar:SingleJar_deploy.jar",
>+         ],
>+         "//conditions:default": [
>+-            "//src/tools/singlejar:singlejar",
>++            "//src/java_tools/singlejar:SingleJar_deploy.jar",
>+         ],
>+     }) + select({
>+         "//tools/jdk:jdk7": [],
>+--- src/main/cpp/blaze_util_posix.cc.orig
>++++ src/main/cpp/blaze_util_posix.cc
>+@@ -29,6 +29,7 @@
>+ #include <sys/resource.h>
>+ #include <sys/wait.h>
>+ #include <unistd.h>
>++#include <time.h>
>+ 
>+ #include <cassert>
>+ #include <cinttypes>
>+@@ -648,8 +649,8 @@
>+ }
>+ 
>+ void TrySleep(unsigned int milliseconds) {
>+-  unsigned int seconds_part = milliseconds / 1000;
>+-  unsigned int nanoseconds_part = (milliseconds % 1000) * 1000 * 1000;
>++  time_t seconds_part = (time_t) (milliseconds / 1000);
>++  long nanoseconds_part = ((long)(milliseconds % 1000)) * 1000 * 1000;
>+   struct timespec sleeptime = {seconds_part, nanoseconds_part};
>+   nanosleep(&sleeptime, NULL);
>+ }

Flags:

aehlig: maintainer-approval+

Actions: View | Diff

Attachments on bug 221114: 184864 | 185169