<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/0ed65f0328d8dc567117926ddd5cf390aa6c2e4c">https://github.com/macports/macports-ports/commit/0ed65f0328d8dc567117926ddd5cf390aa6c2e4c</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 0ed65f0328d compilers: limit options on arm to only working clang and gcc versions
</span>0ed65f0328d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0ed65f0328d8dc567117926ddd5cf390aa6c2e4c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Mar 16 20:43:45 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> compilers: limit options on arm to only working clang and gcc versions
</span>---
_resources/port1.0/compilers/clang_compilers.tcl | 19 ++++++++++++++-----
_resources/port1.0/compilers/gcc_compilers.tcl | 21 ++++++++++++---------
2 files changed, 26 insertions(+), 14 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 79df8e6be88..c91c866a14a 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;'>@@ -7,25 +7,34 @@
</span> # clang 11 and older build on 10.6+ (darwin 10)
# clang 7.0 and older build on 10.5+ (darwin 9)
# clang 3.4 and older build on 10.4+ (darwin 8)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Clang 11 and newer only on Apple Silicon
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global os.major os.arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#if { $${os.major} >= 10 } {
</span> # TODO: evaluate compatibility of clang-{10,11} as defaults instead of 9.0
#lappend compilers macports-clang-11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.arch} ne "arm" && ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: evaluate compatibility of clang-{10,11} as defaults instead of 9.0
</span> #lappend compilers macports-clang-10
lappend compilers macports-clang-9.0 \
macports-clang-8.0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.arch} ne "arm" && ${os.major} >= 9 } {
</span> lappend compilers macports-clang-7.0 \
macports-clang-6.0 \
macports-clang-5.0
}
# Add 10 and 11 as defaults *after* 9.0 - 5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-clang-11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-clang-10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.arch} ne "arm" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-clang-10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {${os.major} < 16} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/compilers/gcc_compilers.tcl b/_resources/port1.0/compilers/gcc_compilers.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 173c4e6e9af..2a21603e064 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/compilers/gcc_compilers.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/compilers/gcc_compilers.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,16 @@
</span> # https://trac.macports.org/ticket/57135
# https://trac.macports.org/ticket/61636
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-gcc-10 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-gcc-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global os.major os.arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.arch} ne "arm" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} >= 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-gcc-10 macports-gcc-9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-gcc-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-gcc-7 macports-gcc-6 macports-gcc-5
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-lappend compilers macports-gcc-7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lappend compilers macports-gcc-devel
</span></pre><pre style='margin:0'>
</pre>