Index: head/devel/bazel/Makefile =================================================================== --- head/devel/bazel/Makefile (revision 452703) +++ head/devel/bazel/Makefile (revision 452704) @@ -1,82 +1,90 @@ # Created by: Klaus Aehlig # $FreeBSD$ PORTNAME= bazel -PORTVERSION= 0.5.3 +PORTVERSION= 0.7.0 CATEGORIES= devel java 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 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 # 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 +FINALRC= 2 -USES= shebangfix zip +USES= shebangfix zip:infozip python SHEBANG_REGEX= .*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so) USE_JAVA= yes JAVA_VENDOR= openjdk JAVA_VERSION= 1.8 JAVA_BUILD= yes JAVA_RUN= yes NO_WRKSUBDIR= YES CONFLICTS_INSTALL?= bazel-clang38 OPTIONS_DEFINE= CLANG38 CLANG38_DESC= Use clang38 as default crosstool CLANG38_BUILD_DEPENDS= clang38:devel/llvm38 CLANG38_RUN_DEPENDS= clang38:devel/llvm38 STRIP= # The bazel binary is also a zip archive (extracted by the elf part), it must not be stripped .include .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. post-patch: @${REINPLACE_CMD} \ -e "s|\"/etc/bazel.bazelrc\"|\"${ETCDIR}/bazel.bazelrc\"|" \ ${WRKSRC}/src/main/cpp/blaze_util_posix.cc - @${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/debian/bazel.bazelrc + @${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/bazel.bazelrc + @${ECHO_CMD} build --python_path=${PYTHON_CMD} >> ${WRKSRC}/scripts/packages/bazel.bazelrc + @${REINPLACE_CMD} \ + -e 's|\$$command|$$command --python_path=${PYTHON_CMD}|' \ + ${WRKSRC}/scripts/bootstrap/bootstrap.sh + @${REINPLACE_CMD} \ + -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ + ${WRKSRC}/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonSemantics.java post-patch-CLANG38-on: @${REINPLACE_CMD} -e 's=/usr/lib/clang=${LOCALBASE}/llvm38/lib/clang=' \ -e 's=/usr/bin/clang=${LOCALBASE}/bin/clang38=' ${WRKSRC}/tools/cpp/CROSSTOOL do-build: @${MKDIR} ${WRKDIR}/bazel_tmp (if [ -z "$${SOURCE_DATE_EPOCH}" ] ; \ then SOURCE_DATE_EPOCH=`grep TIMESTAMP ${DISTINFO_FILE} \ | ${SED} -e 's/[^0-9]//g'`; \ fi ; \ cd ${WRKSRC} && \ ${SETENV} BAZEL_SH=${LOCALBASE}/bin/bash \ TMPDIR=${WRKDIR}/bazel_tmp \ EMBED_LABEL='${PORTVERSION}' \ + PATH=${LOCALBASE}/bin:$$PATH \ SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \ ${LOCALBASE}/bin/bash ./compile.sh) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/scripts/packages/debian/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample + ${INSTALL_DATA} ${WRKSRC}/scripts/packages/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample .include Index: head/devel/bazel/distinfo =================================================================== --- head/devel/bazel/distinfo (revision 452703) +++ head/devel/bazel/distinfo (revision 452704) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501141783 -SHA256 (bazel-0.5.3rc4-dist.zip) = 41d70a98366256a20ddf0b0f2aab826913cd332d90c4f245b2c2e83a66f3d846 -SIZE (bazel-0.5.3rc4-dist.zip) = 100445883 +TIMESTAMP = 1507581916 +SHA256 (bazel-0.7.0rc2-dist.zip) = 5302847e0988ae7839d5efd7cbdff64caa8880af5d9860bc88a665aacc4aa380 +SIZE (bazel-0.7.0rc2-dist.zip) = 84668691 Index: head/devel/bazel/files/extra-i386_src_BUILD =================================================================== --- head/devel/bazel/files/extra-i386_src_BUILD (revision 452703) +++ head/devel/bazel/files/extra-i386_src_BUILD (revision 452704) @@ -1,32 +1,11 @@ --- 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 - #include - #include -+#include - - #include - #include -@@ -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); - } Index: head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh =================================================================== --- head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh (revision 452703) +++ head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh (revision 452704) @@ -1,20 +1,11 @@ --- scripts/bootstrap/bootstrap.sh.orig 2017-03-07 08:07:48 UTC +++ scripts/bootstrap/bootstrap.sh @@ -43,7 +43,7 @@ else --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ --spawn_strategy=standalone \ --nojava_header_compilation \ - --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \ + --strategy=Javac=standalone --ignore_unsupported_sandboxing \ --compilation_mode=opt \ ${EXTRA_BAZEL_ARGS:-}" fi -@@ -96,7 +96,7 @@ function bootstrap_test() { - local BAZEL_BIN=$1 - local BAZEL_SUM=$2 - local BAZEL_TARGET=${3:-src:bazel} -- local STRATEGY="--strategy=Javac=worker --worker_quit_after_build" -+ local STRATEGY="--strategy=Javac=standalone" - if [ "${JAVA_VERSION}" = "1.7" ]; then - STRATEGY= - fi