<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/979fbb0bd36484d4a65f4275d10bbd84b11e2e3c">https://github.com/macports/macports-ports/commit/979fbb0bd36484d4a65f4275d10bbd84b11e2e3c</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 979fbb0 py-tensorflow: Require Jave JDK 11, use java PortGroup to install openjdk11 if required.
</span>979fbb0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 979fbb0bd36484d4a65f4275d10bbd84b11e2e3c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Nov 4 22:05:28 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow: Require Jave JDK 11, use java PortGroup to install openjdk11 if required.
</span>---
python/py-tensorflow/Portfile | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow/Portfile b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a3da59..64a6351 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,6 +3,7 @@
</span> PortSystem 1.0
PortGroup python 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup java 1.0
</span> PortGroup github 1.0
PortGroup compilers 1.0
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +11,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name py-tensorflow
version 1.11.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> github.setup tensorflow tensorflow ${version} v
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,11 +32,16 @@ checksums rmd160 2d04a8f1c0b0796d4a817f82f5743929bc9a6fb9 \
</span>
compiler.blacklist-append {clang < 710}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Required java version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version 11
</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 openjdk11
</span>
# The oldest Xcode version to use default Xcode compiler
# Note setting here should be in sync with that in bazel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set tf_min_xcode 9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set tf_min_xcode 9.0
</span>
if {${os.major} < 16} {
# Work around for issues with clock_gettime(CLOCK_REALTIME, &ts);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,9 +84,11 @@ if {${name} ne ${subport}} {
</span> # Options passed to configure script via env vars
configure.env-append PYTHON_LIB_PATH=${python.prefix}/lib/python${python.branch}/site-packages
configure.env-append PYTHON_BIN_PATH=${prefix}/bin/python${python.branch}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append JAVA_HOME=${java.home}
</span> build.env-append TMPDIR=${workpath}/tmp
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append JAVA_HOME=${java.home}
</span> if {![variant_isset native]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append CC_OPT_FLAGS="-march=ivybridge"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append CC_OPT_FLAGS="-march=ivybridge -O2"
</span> }
# Disable Xcode detection on older OSes, as we want the
# MP provided commandline utilities to be used instead.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +117,7 @@ if {${name} ne ${subport}} {
</span> build {
# Build using the wonderful bazel build system ...
set tf_bazel_cmd "bazel --max_idle_secs=60 --output_user_root=${workpath}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set tf_bazel_build_opts "-s --config=opt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_bazel_build_opts "-s -c opt --config=opt"
</span> if {[vercmp ${xcodeversion} ${tf_min_xcode}] < 0} {
set tf_bazel_build_opts "${tf_bazel_build_opts} --action_env CC=${configure.cc}"
set tf_bazel_cmd "BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 ${tf_bazel_cmd}"
</pre><pre style='margin:0'>
</pre>