<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/a69f6ca5c235867b17eba59cd42a608bb03eccae">https://github.com/macports/macports-ports/commit/a69f6ca5c235867b17eba59cd42a608bb03eccae</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 a69f6ca5c23 py-tensorflow: Disable SDK workaround
</span>a69f6ca5c23 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a69f6ca5c235867b17eba59cd42a608bb03eccae
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Mar 17 14:56:21 2021 +0000

<span style='display:block; white-space:pre;color:#404040;'>    py-tensorflow: Disable SDK workaround
</span>---
 python/py-tensorflow/Portfile | 14 ++++++++------
 1 file changed, 8 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 289b43086bb..e498d603935 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;'>@@ -189,11 +189,13 @@ if {${name} ne ${subport}} {
</span>         set tf_bazel_build_opts "${tf_bazel_build_opts} --jobs ${build.jobs} --local_ram_resources=HOST_RAM*0.5 --local_cpu_resources=HOST_CPUS*.5"
         # Explicitly pass SDK https://github.com/bazelbuild/rules_go/issues/1554
         # Check versioned SDK actually exists... https://trac.macports.org/ticket/60317
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[string first ${configure.sdk_version} ${configure.sdkroot}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set tf_bazel_build_opts "${tf_bazel_build_opts} --macos_sdk_version=${configure.sdk_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ui_warn "configure.sdkroot='${configure.sdkroot}' does not match configure.sdk_version='${configure.sdk_version}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Disable but keep the code below commented for reference, for now, as need to see how it plays out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # See https://trac.macports.org/ticket/62474
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        #if {[string first ${configure.sdk_version} ${configure.sdkroot}] != -1} {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        #} else {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        #}
</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;'>@@ -209,7 +211,7 @@ if {${name} ne ${subport}} {
</span>             set tf_bazel_cmd "BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 ${tf_bazel_cmd}"
         }
         if {[variant_isset mkl]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # Hardcode disable MKL intil build issue is addressed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # Hardcode disable MKL until build issue is addressed
</span>             #set tf_bazel_build_opts "${tf_bazel_build_opts} --config=mkl"
             # Is this required ?
             #set tf_bazel_build_opts "${tf_bazel_build_opts} --cxxopt '-I${prefix}/include/libomp' --linkopt '-L${prefix}/lib/libomp'"
</pre><pre style='margin:0'>

</pre>