<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/308c4fdb234c21402c0b852dd2dddc7cb3fe039f">https://github.com/macports/macports-ports/commit/308c4fdb234c21402c0b852dd2dddc7cb3fe039f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 308c4fdb234c21402c0b852dd2dddc7cb3fe039f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 23 13:39:47 2020 +0100

<span style='display:block; white-space:pre;color:#404040;'>    py-tensorflow{1}: tweak SDK check
</span>---
 python/py-tensorflow/Portfile  | 6 +++---
 python/py-tensorflow1/Portfile | 6 +++---
 2 files changed, 6 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 25116a0..2dfb0b1 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;'>@@ -184,11 +184,11 @@ if {${name} ne ${subport}} {
</span>         # Limit bazel resource utilisation
         set tf_bazel_build_opts "${tf_bazel_build_opts} --jobs ${build.jobs} --local_ram_resources=HOST_RAM*0.75 --local_cpu_resources=HOST_CPUS*.75"
         # Explicitly pass SDK https://github.com/bazelbuild/rules_go/issues/1554
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Check SDK actually exists... https://trac.macports.org/ticket/60317
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[file exists ${configure.sdkroot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Check versioned SDK actually exists... https://trac.macports.org/ticket/60317
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[string first ${configure.sdk_version} ${configure.sdkroot}] != -1} {
</span>             set tf_bazel_build_opts "${tf_bazel_build_opts} --macos_sdk_version=${configure.sdk_version}"
         } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            ui_warn "configure.sdkroot '${configure.sdkroot}' does not exist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_warn "configure.sdkroot='${configure.sdkroot}' does not match configure.sdk_version='${configure.sdk_version}'"
</span>         }
         # hack to try and transfer MP c, c++ and ld options to bazel...
         foreach opt [list {*}${configure.cflags} ] {
<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 bf0f782..f37ec05 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;'>@@ -184,11 +184,11 @@ if {${name} ne ${subport}} {
</span>         # Limit bazel resource utilisation
         set tf_bazel_build_opts "${tf_bazel_build_opts} --jobs ${build.jobs} --local_ram_resources=HOST_RAM*0.75 --local_cpu_resources=HOST_CPUS*.75"
         # Explicitly pass SDK https://github.com/bazelbuild/rules_go/issues/1554
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # Check SDK actually exists... https://trac.macports.org/ticket/60317
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[file exists ${configure.sdkroot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Check versioned SDK actually exists... https://trac.macports.org/ticket/60317
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[string first ${configure.sdk_version} ${configure.sdkroot}] != -1} {
</span>             set tf_bazel_build_opts "${tf_bazel_build_opts} --macos_sdk_version=${configure.sdk_version}"
         } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            ui_warn "configure.sdkroot '${configure.sdkroot}' does not exist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_warn "configure.sdkroot='${configure.sdkroot}' does not match configure.sdk_version='${configure.sdk_version}'"
</span>         }
         # hack to try and transfer MP c, c++ and ld options to bazel...
         foreach opt [list {*}${configure.cflags} ] {
</pre><pre style='margin:0'>

</pre>