<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/2375b5bc3738e50c631a5247696c26f14df10253">https://github.com/macports/macports-ports/commit/2375b5bc3738e50c631a5247696c26f14df10253</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 2375b5bc373 Compilers: Add macports-gcc-devel as a valid option and make default (for now) on arm
</span>2375b5bc373 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2375b5bc3738e50c631a5247696c26f14df10253
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Nov 26 10:53:14 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> Compilers: Add macports-gcc-devel as a valid option and make default (for now) on arm
</span>---
_resources/port1.0/compilers/gcc_compilers.tcl | 4 +++-
_resources/port1.0/group/compilers-1.0.tcl | 26 ++++++++++++++++++--------
2 files changed, 21 insertions(+), 9 deletions(-)
<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 1f050147733..173c4e6e9af 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;'>@@ -1,6 +1,8 @@
</span> # add all working GCC compilers to the variable compilers based on ${os.major}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/57135
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/57135
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/61636
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${os.major} >= 11 } {
lappend compilers macports-gcc-10 \
macports-gcc-9
<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 426ea5b2c04..a109c54761f 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;'>@@ -82,13 +82,18 @@ 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 gcc10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Currently only gcc-devel works on arm machines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} >= 20 && ${os.arch} eq "arm" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers.gcc_default gcc-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers.gcc_default gcc10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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 10}
</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 devel}
</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;'>@@ -96,13 +101,18 @@ foreach ver ${gcc_versions} {
</span> set cdb(gcc$ver_nodot,variant) gcc$ver_nodot
set cdb(gcc$ver_nodot,compiler) macports-gcc-$ver
set cdb(gcc$ver_nodot,descrip) "MacPorts gcc $ver"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,depends) port:gcc$ver_nodot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${ver} 4.6] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc45"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[vercmp ${ver} 7] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { $ver eq "devel" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,depends) port:gcc-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "port:libgcc-devel"
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc${ver_nodot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,depends) port:gcc$ver_nodot
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${ver} 4.6] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc45"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${ver} 7] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc6"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc${ver_nodot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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>