<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/89db224dc9bdf84336931d703155479be09af184">https://github.com/macports/macports-ports/commit/89db224dc9bdf84336931d703155479be09af184</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 89db224dc9bdf84336931d703155479be09af184
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 2 18:09:22 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> compilers PG: Add gcc10
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
<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 46546b9..0662359 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;'>@@ -75,13 +75,13 @@ if {${os.major} < 10} {
</span> } elseif {${os.major} < 11} {
set compilers.gcc_default gcc8
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers.gcc_default gcc9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers.gcc_default gcc10
</span> }
set compilers.list {cc cxx cpp objc fc f77 f90}
# build database of gcc compiler attributes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set gcc_versions {4.4 4.5 4.6 4.7 4.8 4.9 5 6 7 8 9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set gcc_versions {4.4 4.5 4.6 4.7 4.8 4.9 5 6 7 8 9 10}
</span> foreach ver ${gcc_versions} {
# Remove dot from version if present
set ver_nodot [string map {. {}} ${ver}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,13 +91,11 @@ foreach ver ${gcc_versions} {
</span> set cdb(gcc$ver_nodot,descrip) "MacPorts gcc $ver"
set cdb(gcc$ver_nodot,depends) port:gcc$ver_nodot
if {[vercmp ${ver} 4.6] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc7 port:libgcc6 port:libgcc45"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc45"
</span> } elseif {[vercmp ${ver} 7] < 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc7 port:libgcc6"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[vercmp ${ver} 8] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc6"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:lib/libgcc/libgcc_s.1.dylib:libgcc port:libgcc${ver_nodot}"
</span> }
set cdb(gcc$ver_nodot,libfortran) ${prefix}/lib/gcc$ver_nodot/libgfortran.dylib
# note: above is ultimately a symlink to ${prefix}/lib/libgcc/libgfortran.3.dylib
</pre><pre style='margin:0'>
</pre>