<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/a24826ee8d386288e73ae20a8cb6701acf8f2944">https://github.com/macports/macports-ports/commit/a24826ee8d386288e73ae20a8cb6701acf8f2944</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 a24826ee8d3 Compiler selection: allow latest on non-darwin
</span>a24826ee8d3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a24826ee8d386288e73ae20a8cb6701acf8f2944
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 27 18:14:02 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Compiler selection: allow latest on non-darwin
</span>---
_resources/port1.0/compilers/clang_compilers.tcl | 13 ++++---------
_resources/port1.0/compilers/gcc_compilers.tcl | 4 ++--
_resources/port1.0/compilers/gcc_dependencies.tcl | 4 +++-
3 files changed, 9 insertions(+), 12 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 76daca32c7f..f06c8aab8fe 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;'>@@ -11,19 +11,14 @@
</span> # Clang 11 and newer only on Apple Silicon
# Clang 9.0 and newer only on 11+ (Darwin 20)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-global os.major
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-global compiler.cxx_standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global os.major os.platform
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# For now clang-15 only available on Darwin 11 and newer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Also for now, limit to ports requiring c++17 or newer to reduce exposure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 11 || ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For now, limit to ports requiring c++17 or newer to reduce exposure
</span> # to the newest compiler. To be relaxed at some later date.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.cxx_standard} >= 2017} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[option compiler.cxx_standard] >= 2017} {
</span> lappend compilers macports-clang-15
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 11} {
</span> lappend compilers macports-clang-14 \
macports-clang-13 \
macports-clang-12
<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 18f0e29f9a2..20ae44fa0bc 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,10 +3,10 @@
</span> # https://trac.macports.org/ticket/57135
# https://trac.macports.org/ticket/61636
<span style='display:block; white-space:pre;background:#ffe0e0;'>-global os.major os.arch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global os.major os.arch os.platform
</span>
#3 GCC 10 and above on OSX10.6+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 10 || ${os.platform} ne "darwin"} {
</span> lappend compilers macports-gcc-12 macports-gcc-11 macports-gcc-10
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/compilers/gcc_dependencies.tcl b/_resources/port1.0/compilers/gcc_dependencies.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 76152d378c1..e67fb439369 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/compilers/gcc_dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/compilers/gcc_dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,10 @@
</span> # set library dependencies of GCC compilers to the variable libgccs based on gcc_version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+global os.major os.platform
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # GCC version providing the primary runtime
# Note settings here *must* match those in the lang/libgcc port and compilers PG
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span> set gcc_main_version 7
} else {
set gcc_main_version 11
</pre><pre style='margin:0'>
</pre>