Index: head/devel/bazel/Makefile =================================================================== --- head/devel/bazel/Makefile (revision 433121) +++ head/devel/bazel/Makefile (revision 433122) @@ -1,40 +1,57 @@ # Created by: Klaus Aehlig # $FreeBSD$ PORTNAME= bazel -PORTVERSION= 0.4.2r # rc2 of 0.4.2 +PORTVERSION= 0.4.4 CATEGORIES= devel java -MASTER_SITES= https://storage.googleapis.com/bazel/0.4.2/rc2/ -DISTNAME= bazel-0.4.2rc2-dist +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.txt 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= 1 + +BROKEN_FreeBSD_9= fails with static_assert expression error in src/main/cpp/util/numbers.cc + NO_WRKSUBDIR= YES USES= shebangfix zip SHEBANG_FILES= ${WRKSRC}/tools/cpp/link_dynamic_library.sh USE_JAVA= yes JAVA_VENDOR= openjdk JAVA_VERSION= 1.8 JAVA_BUILD= yes JAVA_RUN= yes -PLIST_FILES= bin/bazel +# 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/workspace_layout.cc + @${ECHO_CMD} build --strategy=Javac=standalone >> ${WRKSRC}/scripts/packages/debian/bazel.bazelrc do-build: @${MKDIR} ${WRKDIR}/bazel_tmp (cd ${WRKSRC} && \ ${SETENV} BAZEL_SH=${LOCALBASE}/bin/bash \ TMPDIR=${WRKDIR}/bazel_tmp \ + EMBED_LABEL='${PORTVERSION}' \ ${LOCALBASE}/bin/bash ./compile.sh) do-install: - @${CP} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin + ${CP} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/scripts/packages/debian/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample .include Index: head/devel/bazel/distinfo =================================================================== --- head/devel/bazel/distinfo (revision 433121) +++ head/devel/bazel/distinfo (revision 433122) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480863971 -SHA256 (bazel-0.4.2rc2-dist.zip) = 8e6f41252abadcdb2cc7a07f910ec4b45fb12c46f0a578672c6a186c7efcdb36 -SIZE (bazel-0.4.2rc2-dist.zip) = 89321429 +TIMESTAMP = 1485418133 +SHA256 (bazel-0.4.4rc1-dist.zip) = 573234b67ee4399d8ae1bccb5f57c8943bce8386f83be37fd1f06ffc9a7c4d7f +SIZE (bazel-0.4.4rc1-dist.zip) = 93030753 Index: head/devel/bazel/files/patch-src_main_cpp_util_file__platform.h =================================================================== --- head/devel/bazel/files/patch-src_main_cpp_util_file__platform.h (revision 433121) +++ head/devel/bazel/files/patch-src_main_cpp_util_file__platform.h (nonexistent) @@ -1,10 +0,0 @@ ---- src/main/cpp/util/file_platform.h.orig 2016-12-05 22:12:53 UTC -+++ src/main/cpp/util/file_platform.h -@@ -16,6 +16,7 @@ - #define BAZEL_SRC_MAIN_CPP_UTIL_FILE_PLATFORM_H_ - - #include -+#include - - #include - Property changes on: head/devel/bazel/files/patch-src_main_cpp_util_file__platform.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/bazel/files/patch-src_main_cpp_blaze__util__freebsd.cc =================================================================== --- head/devel/bazel/files/patch-src_main_cpp_blaze__util__freebsd.cc (revision 433121) +++ head/devel/bazel/files/patch-src_main_cpp_blaze__util__freebsd.cc (nonexistent) @@ -1,12 +0,0 @@ ---- src/main/cpp/blaze_util_freebsd.cc.orig 1979-12-31 23:00:00 UTC -+++ src/main/cpp/blaze_util_freebsd.cc -@@ -145,6 +145,9 @@ bool IsSharedLibrary(const string &filen - - string GetDefaultHostJavabase() { - // if JAVA_HOME is defined, then use it as default. -+ if (getenv("JAVA_HOME") == nullptr) { -+ return "/usr/local/openjdk8"; -+ } - string javahome = getenv("JAVA_HOME"); - return !javahome.empty() ? javahome : "/usr/local/openjdk8"; - } Property changes on: head/devel/bazel/files/patch-src_main_cpp_blaze__util__freebsd.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/bazel/files/patch-third__party_protobuf_3.0.0_BUILD =================================================================== --- head/devel/bazel/files/patch-third__party_protobuf_3.0.0_BUILD (revision 433121) +++ head/devel/bazel/files/patch-third__party_protobuf_3.0.0_BUILD (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/protobuf/3.0.0/BUILD.orig 1979-12-31 23:00:00 UTC -+++ third_party/protobuf/3.0.0/BUILD -@@ -87,7 +87,7 @@ COPTS = [ - "-Wno-error=unused-variable", - ] - --LINK_OPTS = ["-lpthread"] -+LINK_OPTS = ["-lpthread", "-lm"] - - cc_library( - name = "protobuf_lite", Property changes on: head/devel/bazel/files/patch-third__party_protobuf_3.0.0_BUILD ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh =================================================================== --- head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh (revision 433121) +++ head/devel/bazel/files/patch-scripts_bootstrap_bootstrap.sh (revision 433122) @@ -1,20 +1,20 @@ --- scripts/bootstrap/bootstrap.sh.orig 1979-12-31 23:00:00 UTC +++ scripts/bootstrap/bootstrap.sh -@@ -39,7 +39,7 @@ if [ "${JAVA_VERSION}" = "1.7" ]; then - else - : ${BAZEL_ARGS:=--java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ - --host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ +@@ -47,7 +47,7 @@ else + --host_javabase=$JAVA_HOME \ + --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 -@@ -91,7 +91,7 @@ function bootstrap_test() { +@@ -99,7 +99,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 Index: head/devel/bazel/pkg-plist =================================================================== --- head/devel/bazel/pkg-plist (nonexistent) +++ head/devel/bazel/pkg-plist (revision 433122) @@ -0,0 +1,2 @@ +bin/bazel +@sample %%ETCDIR%%/bazel.bazelrc.sample Property changes on: head/devel/bazel/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property