<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/ab3dd65b12a58aa1df4bfd9fe952b53dd904bd61">https://github.com/macports/macports-ports/commit/ab3dd65b12a58aa1df4bfd9fe952b53dd904bd61</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ab3dd65b12a58aa1df4bfd9fe952b53dd904bd61
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Nov 4 18:36:58 2018 +0000

<span style='display:block; white-space:pre;color:#404040;'>    bazel: Move bash completion to optional variant. Require java JDK 10 and define openjdk10 as fallback when missing.
</span>---
 devel/bazel/Portfile | 55 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 22 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 ba883bb..86466e5 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;'>@@ -9,7 +9,7 @@ PortGroup             xcodeversion 1.0
</span> PortGroup             compiler_blacklist_versions 1.0
 
 github.setup          bazelbuild bazel 0.19.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision              0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision              1
</span> github.tarball_from   releases
 categories            devel
 maintainers           {tfmnet.com:mohamed.issa @RootFunction} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,21 +31,23 @@ 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;'>-                      bin:bash:bash \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                      bin:zip:zip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append    port:cctools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patch.pre_args        -p1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Minimum required java version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version          9+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Required java version. Currently 11 does not work so specify 10 only.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version          10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback         openjdk10
</span> 
 # The oldest Xcode version to use default Xcode compiler
 # Note setting here should be in sync with that in py-tensorflow
 set bazel_min_xcode   9.0
 
<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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append    port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Older OS hacks
 if {${os.major} < 16} {
     # https://github.com/bazelbuild/bazel/issues/6188
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,13 +69,16 @@ compiler.blacklist-append {clang < 710}
</span> #compilers.setup           require_fortran
 build.env-append  CC=${configure.cc} \
                  CXX=${configure.cxx} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-              TMPDIR=${workpath}/tmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+              TMPDIR=${workpath}/tmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           JAVA_HOME=${java.home}
</span> # Disable Xcode detection on older OSes, as we want the
 # MP provided commandline utilities to be used instead.
 if {[vercmp ${xcodeversion} ${bazel_min_xcode}] < 0} {
     build.env-append BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant bash description {Enable bash completion support} { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {
 
     if {[vercmp ${xcodeversion} ${bazel_min_xcode}] < 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,16 +95,21 @@ build {
</span>     }
 
     # Build bazel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system -W ${worksrcpath} "VERBOSE=yes BAZEL_WRKDIR=${workpath} ./compile.sh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${worksrcpath} "JAVA_HOME=${java.home} VERBOSE=yes BAZEL_WRKDIR=${workpath} ./compile.sh"
</span> 
     # Put executable in main working folder
     xinstall -m 755 -W ${worksrcpath}/output ${name} ${worksrcpath}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Include bash completion support ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { [variant_isset bash]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Get ready to build the bash completion script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file delete -force /var/tmp/_${name}_root
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Get ready to build the bash completion script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    file delete -force /var/tmp/_${name}_root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Build the bash completion script
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system -W ${worksrcpath} "./${name} --max_idle_secs=60 --output_user_root=${workpath} build -s --javabase //:jdk10 --host_javabase //:jdk10 //scripts:${name}-complete.bash"
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Build the bash completion script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system -W ${worksrcpath} "./${name} --max_idle_secs=60 --output_user_root=${workpath} build -s //scripts:${name}-complete.bash"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,14 +117,15 @@ destroot {
</span>     set bindir ${prefix}/bin
     xinstall -d ${destroot}${bindir}
     xinstall -m 755 -W ${worksrcpath}/output ${name} ${destroot}${bindir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     # Copy bash and zsh completion scripts to designated area for on-demand usage
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set bcompldir ${prefix}/share/bash-completion/completions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d ${destroot}${bcompldir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 ${worksrcpath}/${name}-bin/scripts/${name}-complete.bash ${destroot}${bcompldir}/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set zcompldir ${prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d ${destroot}${zcompldir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 ${worksrcpath}/scripts/zsh_completion/_${name} ${destroot}${zcompldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { [variant_isset bash]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set bcompldir ${prefix}/share/bash-completion/completions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d ${destroot}${bcompldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 755 ${worksrcpath}/${name}-bin/scripts/${name}-complete.bash ${destroot}${bcompldir}/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set zcompldir ${prefix}/share/zsh/site-functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d ${destroot}${zcompldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 755 ${worksrcpath}/scripts/zsh_completion/_${name} ${destroot}${zcompldir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 post-destroot {
</pre><pre style='margin:0'>

</pre>