Page MenuHomeFreeBSD
Files F159177391

D11937.id.diff
No OneTemporary
Actions

D11937.id.diff
View Options

Index: head/devel/bazel/Makefile
===================================================================
--- head/devel/bazel/Makefile
+++ head/devel/bazel/Makefile
@@ -13,17 +13,16 @@
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
+BROKEN_armv6= fails to package: cp: bazel: No such file or directory
+
BUILD_DEPENDS= bash:shells/bash \
zip:archivers/zip
-BROKEN_armv6= fails to package: cp: bazel: No such file or directory
-
# 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= 4
-NO_WRKSUBDIR= YES
USES= shebangfix zip
SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)
USE_JAVA= yes
@@ -32,6 +31,8 @@
JAVA_BUILD= yes
JAVA_RUN= yes
+NO_WRKSUBDIR= YES
+
CONFLICTS_INSTALL?= bazel-clang38
OPTIONS_DEFINE= CLANG38
@@ -39,6 +40,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 +78,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>
Index: head/devel/bazel/files/extra-i386_src_BUILD
===================================================================
--- head/devel/bazel/files/extra-i386_src_BUILD
+++ head/devel/bazel/files/extra-i386_src_BUILD
@@ -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);
+ }

File Metadata

Mime Type
text/plain
Expires
Thu, Jun 11, 11:35 PM (17 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33894266
Default Alt Text
D11937.id.diff (2 KB)

Event Timeline