<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d414201cca20c50412071d6ae7690b42555b2550">https://github.com/macports/macports-ports/commit/d414201cca20c50412071d6ae7690b42555b2550</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d414201cca20c50412071d6ae7690b42555b2550
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue Oct 26 08:15:39 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    py-tensorflow1: Add conflict to tensorflow-macos
</span>---
 python/py-tensorflow1/Portfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

<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 813b7aedc18..b950a62e1a1 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;'>@@ -63,14 +63,18 @@ python.versions  37 38 39
</span> if {${name} ne ${subport}} {
 
     PortGroup bazel 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     bazel.version   "0.25"
 
     # TF versions 1 and 2 cannot be installed at once
     conflicts py${python.version}-tensorflow
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Conflicts with tensorflow_macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {${python.version} eq 38} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        conflicts-append py${python.version}-tensorflow_macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Conflicts with tensorflow-macos
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { (${build_arch} eq {arm64} && (${python.version} eq 38 || ${python.version} eq 39))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        || (${build_arch} eq {x86_64} && ${python.version} eq 38) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        conflicts-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    py${python.version}-tensorflow-macos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    py${python.version}-tensorflow_macos
</span>     }
 
     depends_build-append \
</pre><pre style='margin:0'>

</pre>