<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/375abfdbb6078a5c5bdd640f4c21a6d2b6c4ed96">https://github.com/macports/macports-ports/commit/375abfdbb6078a5c5bdd640f4c21a6d2b6c4ed96</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 375abfdbb6078a5c5bdd640f4c21a6d2b6c4ed96
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Oct 18 15:10:04 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> bazel : Remove useless javac check (shim always exists). Use java portgroup instead.
</span><span style='display:block; white-space:pre;color:#404040;'> : Add unzip dependency as required to fix build issue.
</span>---
devel/bazel/Portfile | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bazel/Portfile b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cb28244..def2688 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bazel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,18 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup java 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Might be useful to support older systems at some point.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#compiler.blacklist-append {clang < 702}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#compilers.setup require_fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# FC=${configure.fc}
</span>
github.setup bazelbuild bazel 0.18.0
github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,16 +24,6 @@ long_description ${description}
</span> platforms darwin
license Apache-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure the Java compiler exists
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cmdnm "javac"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set param [auto_execok $cmdnm]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$param == ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "The Java compiler was not detected on this machine. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Please ensure JDK 8 or newer is properly installed."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> distname ${distname}-dist
checksums rmd160 f87bab520c406cc67662c7a4bf9ac588f58dae41 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,10 +35,15 @@ extract.mkdir yes
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append bin:python:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append bin:bash:bash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append bin:zip:zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append bin:git:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append bin:python:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:bash:bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:zip:zip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:git:git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/bazelbuild/bazel/issues/6188
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} <= 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:unzip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build {
system -W ${worksrcpath} "./compile.sh"
</pre><pre style='margin:0'>
</pre>