<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/7caaa5bcf0effbb9c48fefb230018a18ba142648">https://github.com/macports/macports-ports/commit/7caaa5bcf0effbb9c48fefb230018a18ba142648</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7caaa5bcf0e bazel: minor adjustments
</span>7caaa5bcf0e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7caaa5bcf0effbb9c48fefb230018a18ba142648
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Sep 6 10:42:43 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> bazel: minor adjustments
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use LTS Java as fallback
</span><span style='display:block; white-space:pre;color:#404040;'> Public updates for openjdk12 ended 2019-09
</span><span style='display:block; white-space:pre;color:#404040;'> Public updates for openjdk13 ended 2020-03
</span><span style='display:block; white-space:pre;color:#404040;'> openjdk11 is supported at least until 2023
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Reorder compiler settings to be completely set before being read
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove redundant comments, unused portgroups
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update maintainer GitHub handle
</span>---
devel/bazel/Portfile | 49 +++++++++++++++++++------------------------------
1 file changed, 19 insertions(+), 30 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 994bddeda6a..06f1b8b5b0e 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;'>@@ -3,13 +3,8 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup xcodeversion 1.0
</span> PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# epoch unfortunately needed to go back to 0.18.0 as 0.19.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# built tensorflow badily, giving runtime seg. faults...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Now resolved, but epoch must NOT be removed though now.
</span> epoch 1
# List of all bazel sub-ports ( e.g. as required by tensorflow )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +21,6 @@ foreach b [lsearch -inline -all -not -exact $all_bazels ${subport}] {
</span> conflicts-append $b
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Java PG settings. Potentially changed in sub-port specifics below.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set java_v 11+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set java_f openjdk13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Min supported Darwin version
set min_darwin 16
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,9 +59,6 @@ if { ${name} eq ${subport} } {
</span> checksums rmd160 cfff49a4be85f7693ae615c293b13d0a447b80d7 \
sha256 7456032199852c043e6c5b3e4c71dd8089c1158f72ec554e6ec1c77007f0ab51 \
size 275804130
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Java fallback
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set java_f openjdk12
</span>
# min OS
set min_darwin 14
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,18 +76,18 @@ if { ${os.platform} eq "darwin" && ${os.major} < ${min_darwin} } {
</span> }
# Required java version.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version ${java_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback ${java_f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version 11+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# LTS JDK port to install if required java not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback openjdk11
</span> # JDK only needed at build time, but java PG sets lib dependency so
# declare no conflict to allow redistribution of binaries.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license_noconflict ${java_f}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license_noconflict ${java.fallback}
</span>
github.tarball_from releases
categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {tfmnet.com:mohamed.issa @RootFunction} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {tfmnet.com:mohamed.issa @missa-prime} \
</span> {jonesc @cjones051073} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,14 +109,22 @@ patch.pre_args -p1
</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:#ffe0e0;'>-# Work out if we should be using macports clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set use_mp_clang [ expr ( [ string match macports-clang-* ${configure.compiler} ] || [ vercmp ${xcodeversion} ${bazel_min_xcode} ] < 0 ) ]
</span>
# Even though bazel can build without Xcode, mark use Xcode for now since it fails to
# build with tracemode on latest master if both CLT and Xcode are available.
# Better solution is to respect MacPorts environment configure.developer_dir
use_xcode yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Blacklist too old system compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Clang 7, 8 and 9 fail with missing libarclite on older systems (e.g. 10.10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ../usr/bin/xcrun /opt/local/bin/clang-mp-8.0 -fobjc-arc -framework CoreServices -framework Foundation -o /opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_devel_bazel/bazel26/work/.tmp/bazel_4sKHinCP/archive/_embedded_binaries/xcode-locator tools/osx/xcode_locator.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ld: file not found: /opt/local/libexec/llvm-8.0/lib/arc/libarclite_macosx.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # python versions. Build needs both 'python2' and 'python3'
set py3ver 3.8
set py2ver 2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,21 +176,14 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Blacklist too old system compilers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 710}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Clang 7, 8 and 9 fail with missing libarclite on older systems (e.g. 10.10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ../usr/bin/xcrun /opt/local/bin/clang-mp-8.0 -fobjc-arc -framework CoreServices -framework Foundation -o /opt/local/var/macports/build/_opt_bblocal_var_buildworker_ports_build_ports_devel_bazel/bazel26/work/.tmp/bazel_4sKHinCP/archive/_embedded_binaries/xcode-locator tools/osx/xcode_locator.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ld: file not found: /opt/local/libexec/llvm-8.0/lib/arc/libarclite_macosx.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {macports-clang-[7-9].0}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# require c++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.env-append CC=${configure.cc} \
CXX=${configure.cxx} \
TMPDIR=${workpath}/tmp \
JAVA_HOME=${java.home}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Work out if we should be using macports clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set use_mp_clang [ expr ( [ string match macports-clang-* ${configure.compiler} ] || [ vercmp ${xcodeversion} ${bazel_min_xcode} ] < 0 ) ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Disable Xcode detection on older OSes, as we want the
# MP provided commandline utilities to be used instead.
if { ${use_mp_clang} } {
</pre><pre style='margin:0'>
</pre>