<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/887ed39a738a35d66e751a0be864f976828c925c">https://github.com/macports/macports-ports/commit/887ed39a738a35d66e751a0be864f976828c925c</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 887ed39a738 Revert "Compilers: Add clang-12 to known lists"
</span>887ed39a738 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 887ed39a738a35d66e751a0be864f976828c925c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jun 4 05:36:40 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> Revert "Compilers: Add clang-12 to known lists"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit 2a183ebab5446627e00cb6c0c831f630d2a9eeb5.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Causes breakage on older OS versions; see comments on the original
</span><span style='display:block; white-space:pre;color:#404040;'> commit.
</span>---
_resources/port1.0/compilers/clang_compilers.tcl | 4 ++--
_resources/port1.0/group/compilers-1.0.tcl | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/compilers/clang_compilers.tcl b/_resources/port1.0/compilers/clang_compilers.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a3bdf03fc5..42144f5b32e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/compilers/clang_compilers.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/compilers/clang_compilers.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@ if { ${os.arch} ne "arm" && ${os.major} >= 9 && ${os.major} < 20 } {
</span> macports-clang-5.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Add 10+ as defaults *after* 9.0 - 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Add 10 and 11 as defaults *after* 9.0 - 5.0
</span> if { ${os.major} >= 10} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-clang-12 macports-clang-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-11
</span> if { ${os.arch} ne "arm" } {
lappend compilers macports-clang-10
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 92b6f68d126..a0e5a0fa0cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +159,9 @@ foreach ver ${gcc_versions} {
</span>
# build database of clang compiler attributes
# Should match those in compilers/clang_compilers.tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.arch} ne "arm" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.arch} eq "arm" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clang_versions {11 devel}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span> set clang_versions {}
if {${os.major} < 16} {
if {${os.major} < 9} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,10 +179,9 @@ if { ${os.arch} ne "arm" } {
</span> if { ${os.major} < 20 } {
lappend clang_versions 8.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend clang_versions 9.0 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend clang_versions 9.0 10 11 devel
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-lappend clang_versions 11 12 devel
</span> ui_debug "Clang versions for Darwin ${os.major} ${os.arch} - ${clang_versions}"
foreach ver ${clang_versions} {
# Remove dot from version if present
</pre><pre style='margin:0'>
</pre>