Index: branches/2017Q3/devel/bazel/Makefile =================================================================== --- branches/2017Q3/devel/bazel/Makefile (revision 448195) +++ branches/2017Q3/devel/bazel/Makefile (revision 448196) @@ -1,63 +1,81 @@ # Created by: Klaus Aehlig # $FreeBSD$ PORTNAME= bazel -PORTVERSION= 0.5.0 +PORTVERSION= 0.5.3 CATEGORIES= devel java MASTER_SITES= https://storage.googleapis.com/bazel/${PORTVERSION}/rc${FINALRC}/ DISTNAME= bazel-${PORTVERSION}rc${FINALRC}-dist -MAINTAINER= aehlig@linta.de +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 -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= 9 +FINALRC= 4 -NO_WRKSUBDIR= YES USES= shebangfix zip 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 + +.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 +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}' \ SOURCE_DATE_EPOCH=$${SOURCE_DATE_EPOCH} \ ${LOCALBASE}/bin/bash ./compile.sh) do-install: # The bazel binary is also a zip archive (extracted by the elf part), hence cannot be stripped ${CP} ${WRKSRC}/output/bazel ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/scripts/packages/debian/bazel.bazelrc ${STAGEDIR}${ETCDIR}/bazel.bazelrc.sample -.include +.include Index: branches/2017Q3/devel/bazel/distinfo =================================================================== --- branches/2017Q3/devel/bazel/distinfo (revision 448195) +++ branches/2017Q3/devel/bazel/distinfo (revision 448196) @@ -1,3 +1,3 @@ -TIMESTAMP = 1495581096 -SHA256 (bazel-0.5.0rc9-dist.zip) = b2b2f2e399cd341d91d27f3df0f9862ef0c4c51cc256fd2bda6ca93c0f00e27f -SIZE (bazel-0.5.0rc9-dist.zip) = 98166774 +TIMESTAMP = 1501141783 +SHA256 (bazel-0.5.3rc4-dist.zip) = 41d70a98366256a20ddf0b0f2aab826913cd332d90c4f245b2c2e83a66f3d846 +SIZE (bazel-0.5.3rc4-dist.zip) = 100445883 Index: branches/2017Q3/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt =================================================================== --- branches/2017Q3/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt (revision 448195) +++ branches/2017Q3/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt (nonexistent) @@ -1,11 +0,0 @@ ---- src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt.orig 2017-03-31 21:28:24 UTC -+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt -@@ -32,7 +32,7 @@ if IsWindows() and not PYTHON_BINARY.end - - # Find a file in a given search path. - def SearchPath(name): -- search_path = os.getenv('PATH', os.defpath).split(os.pathsep) -+ search_path = os.getenv('PATH', os.defpath + ":/usr/local/bin").split(os.pathsep) - for directory in search_path: - if directory == '': continue - path = os.path.join(directory, name) Property changes on: branches/2017Q3/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_stub__template.txt ___________________________________________________________________ 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: branches/2017Q3/devel/bazel/files/extra-i386_src_BUILD =================================================================== --- branches/2017Q3/devel/bazel/files/extra-i386_src_BUILD (nonexistent) +++ branches/2017Q3/devel/bazel/files/extra-i386_src_BUILD (revision 448196) @@ -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 + #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); + } Property changes on: branches/2017Q3/devel/bazel/files/extra-i386_src_BUILD ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: branches/2017Q3/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt =================================================================== --- branches/2017Q3/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt (nonexistent) +++ branches/2017Q3/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt (revision 448196) @@ -0,0 +1,11 @@ +--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 2017-07-25 04:58:01 UTC ++++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt +@@ -38,7 +38,7 @@ if IsWindows() and not PYTHON_BINARY.end + + # Find a file in a given search path. + def SearchPath(name): +- search_path = os.getenv('PATH', os.defpath).split(os.pathsep) ++ search_path = os.getenv('PATH', os.defpath + ":/usr/local/bin").split(os.pathsep) + for directory in search_path: + if directory == '': continue + path = os.path.join(directory, name) Property changes on: branches/2017Q3/devel/bazel/files/patch-src_main_java_com_google_devtools_build_lib_bazel_rules_python_python__stub__template.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q3 =================================================================== --- branches/2017Q3 (revision 448195) +++ branches/2017Q3 (revision 448196) Property changes on: branches/2017Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r445987,446868,447714