<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/c535aa57499893c3e7e1a99ef151d0deacf28909">https://github.com/macports/macports-ports/commit/c535aa57499893c3e7e1a99ef151d0deacf28909</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 c535aa5 xcode_workaround PG: add problematic OS option
</span>c535aa5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c535aa57499893c3e7e1a99ef151d0deacf28909
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon May 11 07:29:12 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> xcode_workaround PG: add problematic OS option
</span>---
_resources/port1.0/group/xcode_workaround-1.0.tcl | 15 ++++++++++++++-
python/py-tensorflow/Portfile | 1 +
2 files changed, 15 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/xcode_workaround-1.0.tcl b/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c7950ea..9ed237b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/xcode_workaround-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +16,8 @@
</span> # avoid_xcode_compiler (blacklist broken compiler)
#
# xcode_workaround.fixed_xcode_version: minimum developer version in which bug is fixed
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# xcode_workaround.os_versions: major Darwin versions to attempt to apply workarounds
</span>
PortGroup cltversion 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +26,11 @@ namespace eval xcode_workaround {
</span>
options xcode_workaround.type
options xcode_workaround.fixed_xcode_version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+options xcode_workaround.os_versions
</span>
default xcode_workaround.type {append_to_compiler_flags}
default xcode_workaround.fixed_xcode_version {11.3}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default xcode_workaround.os_versions {19}
</span>
proc xcode_workaround::xcode_workaround.appy_fix {} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +41,7 @@ proc xcode_workaround::xcode_workaround.appy_fix {} {
</span> developerversion \
xcode_workaround.type \
xcode_workaround.fixed_xcode_version \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xcode_workaround.os_versions \
</span> configure.cc \
configure.cxx \
configure.cflags \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +52,15 @@ proc xcode_workaround::xcode_workaround.appy_fix {} {
</span> use_xcode
# Xcode 11 fixes (applicable to macOS 10.14 and macOS 10.15)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set attempt_fix [ expr ( ${os.major} == 19 || ( ${os.major} == 18 && [vercmp $xcodeversion 11] >= 0 ) ) ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set attempt_fix no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [lsearch -exact ${xcode_workaround.os_versions} ${os.major}] != -1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 19 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set attempt_fix yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 18 && [vercmp $xcodeversion 11] >= 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set attempt_fix yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if { ${attempt_fix} } {
<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 8840a84..6198e41 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;'>@@ -60,6 +60,7 @@ set use_mp_clang [ expr ( [ string match macports-clang-* ${configure.compiler}
</span>
# https://trac.macports.org/ticket/59192
xcode_workaround.type avoid_xcode_compiler
<span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.os_versions 18 19
</span> xcode_workaround.fixed_xcode_version 11.4
#patch.pre_args -p1
</pre><pre style='margin:0'>
</pre>