sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fix build on i386

Browse source 
* Cleanup Makefile

PR:		221114
Submitted by:	Klaus Aehlig (maintainer)
Reviewed by:	matthew (mentor)
Approved by:	matthew (mentor)
MFH:		2017Q3
Differential Revision:	https://reviews.freebsd.org/D11937
This commit is contained in:
Richard Gallamore 2017-08-10 18:35:46 +00:00
parent a2b665648b
commit e87b32a639
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=447714
2 changed files with 43 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
devel/bazel/Makefile
View file

@ -13,17 +13,16 @@ COMMENT= Fast and correct build system
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_VERSION= 1.8
JAVA_BUILD= yes
JAVA_RUN= yes
NO_WRKSUBDIR= YES
CONFLICTS_INSTALL?= bazel-clang38
OPTIONS_DEFINE= CLANG38
@ -39,6 +40,12 @@ CLANG38_DESC= Use clang38 as default crosstool
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 @@ do-install:
@${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>

32
devel/bazel/files/extra-i386_src_BUILD Normal file
View file

@ -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);
}