<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/f23dca5afb4bf4a01accb861d9095f9383e41930">https://github.com/macports/macports-base/commit/f23dca5afb4bf4a01accb861d9095f9383e41930</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 f23dca5af Add 2020 as known c++ standard
</span>f23dca5af is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f23dca5afb4bf4a01accb861d9095f9383e41930
</span>Author: Chris Jones <cjones051073@icloud.com>
AuthorDate: Tue Jan 4 10:17:05 2022 +0000
<span style='display:block; white-space:pre;color:#404040;'> Add 2020 as known c++ standard
</span>---
src/port1.0/portconfigure.tcl | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portconfigure.tcl b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3bc277e5d..6ed51545e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portconfigure.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -862,14 +862,15 @@ proc portconfigure::max_version {verA verB} {
</span> # https://en.cppreference.com/w/cpp/compiler_support
# Xcode release notes
# https://trac.macports.org/wiki/XcodeVersionInfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#| C++ Standard | Clang | Xcode Clang | Xcode | GCC |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#|------------------------------------------------------------------|
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#| 1998 (C++98) | - | - | - | - |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#| 2011 (C++11) | 3.3 | 500.2.75 | 5.0 | 4.8.1 |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#| 2014 (C++14) | 3.4 | 602.0.49 | 6.3 | 5 |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#| 2017 (C++17) | 5.0 | 1000.11.45.2 | 10.0 | 7 |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#-----------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#| C++ Standard | Clang | Xcode Clang | Xcode | GCC |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#|---------------------------------------------------------------------|
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#| 1998 (C++98) | - | - | - | - |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#| 2011 (C++11) | 3.3 | 500.2.75 | 5.0 | 4.8.1 |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#| 2014 (C++14) | 3.4 | 602.0.49 | 6.3 | 5 |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#| 2017 (C++17) | 5.0 | 1000.11.45.2 | 10.0 | 7 |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#| 2020 (C++20) | 14 | 1400.0.29.102 | 14.0 | 11 |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#-----------------------------------------------------------------------
</span> #
# https://openmp.llvm.org
# https://gcc.gnu.org/wiki/openmp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -922,12 +923,14 @@ proc portconfigure::get_min_command_line {compiler} {
</span> # no Xcode clang can build against libc++ on < 10.7
return none
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.c_standard} >= 2017} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${compiler.c_standard} >= 2017} {
</span> set min_value [max_version $min_value 1000.11.45.2]
} elseif {${compiler.c_standard} >= 2011} {
set min_value [max_version $min_value 500.2.75]
}
<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 {${compiler.cxx_standard} >= 2020} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 1400.0.29.102]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${compiler.cxx_standard} >= 2017} {
</span> set min_value [max_version $min_value 1000.11.45.2]
} elseif {${compiler.cxx_standard} >= 2014} {
set min_value [max_version $min_value 602.0.49]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -975,12 +978,14 @@ proc portconfigure::get_min_command_line {compiler} {
</span> proc portconfigure::get_min_clang {} {
global compiler.c_standard compiler.cxx_standard compiler.openmp_version compiler.thread_local_storage
set min_value 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.c_standard} >= 2017} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${compiler.c_standard} >= 2017} {
</span> set min_value [max_version $min_value 6.0]
} elseif {${compiler.c_standard} >= 2011} {
set min_value [max_version $min_value 3.1]
}
<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 {${compiler.cxx_standard} >= 2020} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 14]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${compiler.cxx_standard} >= 2017} {
</span> set min_value [max_version $min_value 5.0]
} elseif {${compiler.cxx_standard} >= 2014} {
if {[option configure.cxx_stdlib] eq "libc++"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1021,14 +1026,16 @@ proc portconfigure::get_min_gcc {} {
</span> }
set min_value 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${compiler.c_standard} >= 2017} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${compiler.c_standard} >= 2017} {
</span> set min_value [max_version $min_value 8]
} elseif {${compiler.c_standard} >= 2011} {
set min_value [max_version $min_value 4.3]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${compiler.c_standard} >= 1999} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${compiler.c_standard} >= 1999} {
</span> set min_value [max_version $min_value 4.0]
}
<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 {${compiler.cxx_standard} >= 2020} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set min_value [max_version $min_value 11]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${compiler.cxx_standard} >= 2017} {
</span> set min_value [max_version $min_value 7]
} elseif {${compiler.cxx_standard} >= 2014} {
set min_value [max_version $min_value 5]
</pre><pre style='margin:0'>
</pre>