<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/60f9d40164053ec0784008cf582841e953ca5c09">https://github.com/macports/macports-ports/commit/60f9d40164053ec0784008cf582841e953ca5c09</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 60f9d40 py-tensorflow{1}: Explicitly pass SDK to bazel build
</span>60f9d40 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 60f9d40164053ec0784008cf582841e953ca5c09
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 9 11:09:47 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> py-tensorflow{1}: Explicitly pass SDK to bazel build
</span>---
python/py-tensorflow/Portfile | 14 +++++++++++---
python/py-tensorflow1/Portfile | 11 ++++++++---
2 files changed, 19 insertions(+), 6 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 92604a5..3a8c6f2 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;'>@@ -30,11 +30,12 @@ checksums rmd160 53b38674e167f00d13eacef4ac7da5c8a364f1f6 \
</span> sha256 92b44979b36ab6a9760a777b5faba50df20ad5a9d590f02fa3084e06d8901791 \
size 42104809
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 16 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set min_darwin 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < ${min_darwin} } {
</span> known_fail yes
# https://trac.macports.org/ticket/58518
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires macOS10.12 or newer."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} requires Darwin ${min_darwin} or newer."
</span> return -code error "incompatible macOS version"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +82,9 @@ python.versions 37 38
</span> python.default_version 38
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-tensorflow1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TF versions 1 and 2 cannot be installed at once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-tensorflow1
</span>
depends_build-append \
port:py${python.version}-future \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,6 +174,8 @@ if {${name} ne ${subport}} {
</span> # Build using the wonderful bazel build system ...
set tf_bazel_cmd "bazel --max_idle_secs=60 --output_user_root=${workpath}"
set tf_bazel_build_opts "-s -c opt --verbose_failures --config=opt"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Explicitly pass SDK https://github.com/bazelbuild/rules_go/issues/1554
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_bazel_build_opts "${tf_bazel_build_opts} --macos_sdk_version=${configure.sdk_version}"
</span> # hack to try and transfer MP c, c++ and ld options to bazel...
foreach opt [list {*}${configure.cflags} ] {
set tf_bazel_build_opts "${tf_bazel_build_opts} --conlyopt '${opt}'"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,6 +199,9 @@ if {${name} ne ${subport}} {
</span> set tf_bazel_build_opts "${tf_bazel_build_opts} --copt=${base_march}"
set tf_bazel_cmd "CC_OPT_FLAGS=${base_march} ${tf_bazel_cmd}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Bazel build command : ${tf_bazel_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Bazel build options : ${tf_bazel_build_opts}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Run the build
</span> system -W ${worksrcpath} "${tf_bazel_cmd} build ${tf_bazel_build_opts} //tensorflow/tools/pip_package:build_pip_package"
# Build the python wheel
system -W ${worksrcpath} "./bazel-bin/tensorflow/tools/pip_package/build_pip_package ${workpath}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tensorflow1/Portfile b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28c3a5d..87eb73a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tensorflow1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +30,12 @@ checksums rmd160 272ac64c4a4b43e1dbbf3e33950fedb3cdb4a6ee \
</span> sha256 3cb4c8bfcda02b09266d19c907023fb40f12991fb975b9737cbb242ddb8a66c5 \
size 46199279
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set min_darwin 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < ${min_darwin} } {
</span> known_fail yes
# https://trac.macports.org/ticket/58518
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} ${version} requires macOS10.10 or newer."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} ${version} requires Darwin ${min_darwin} or newer."
</span> return -code error "incompatible macOS version"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,7 +78,9 @@ python.versions 27 36 37 38
</span> python.default_version 38
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts py${python.version}-tensorflow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TF versions 1 and 2 cannot be installed at once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-tensorflow
</span>
depends_build-append \
port:py${python.version}-future \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,6 +175,8 @@ if {${name} ne ${subport}} {
</span> # Build using the wonderful bazel build system ...
set tf_bazel_cmd "bazel --max_idle_secs=60 --output_user_root=${workpath}"
set tf_bazel_build_opts "-s -c opt --config=opt"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Explicitly pass SDK https://github.com/bazelbuild/rules_go/issues/1554
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set tf_bazel_build_opts "${tf_bazel_build_opts} --macos_sdk_version=${configure.sdk_version}"
</span> # hack to try and transfer MP c, c++ and ld options to bazel...
foreach opt [list {*}${configure.cflags} ] {
set tf_bazel_build_opts "${tf_bazel_build_opts} --conlyopt '${opt}'"
</pre><pre style='margin:0'>
</pre>