<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/7fa01bc73e4c0ed2248f05e685c669c7eb2d24fc">https://github.com/macports/macports-ports/commit/7fa01bc73e4c0ed2248f05e685c669c7eb2d24fc</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 7fa01bc73e4 compilers PG: Avoid direct dependency on primary libgccX
</span>7fa01bc73e4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7fa01bc73e4c0ed2248f05e685c669c7eb2d24fc
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri May 7 13:49:24 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> compilers PG: Avoid direct dependency on primary libgccX
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 17 ++++++++++++++++-
lang/libgcc/Portfile | 3 ++-
2 files changed, 18 insertions(+), 2 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 26ebbfdc0fd..6bcdfc8a53d 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;'>@@ -105,6 +105,17 @@ if { ${os.arch} eq "arm" } {
</span> lappend gcc_versions 9 10 devel
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# GCC version providing the primary runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note settings here *must* match those in the lang/libgcc port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_main_version 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_main_version 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_main_version 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> ui_debug "GCC versions for Darwin ${os.major} ${os.arch} - ${gcc_versions}"
foreach ver ${gcc_versions} {
# Remove dot from version if present
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,8 +134,12 @@ foreach ver ${gcc_versions} {
</span> set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc45"
} elseif {[vercmp ${ver} 7] < 0} {
set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc6"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${ver} ${gcc_main_version}] < 0} {
</span> set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc port:libgcc${ver_nodot}"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Do not depend directly on primary runtime port, as implied by libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and doing so prevents libgcc-devel being used as an alternative.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cdb(gcc$ver_nodot,dependsl) "path:share/doc/libgcc/README:libgcc"
</span> }
set cdb(gcc$ver_nodot,dependsa) gcc$ver_nodot
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/libgcc/Portfile b/lang/libgcc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fbfd9c4cf4d..d106b8df66d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/libgcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/libgcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,8 @@ homepage https://www.macports.org/
</span> variant universal { }
# Pick the gcc version that provides the primary runtime.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# NOTE : The logic here must match that in the gccX ports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# NOTE : The logic here must match that in the gccX ports *and*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# that in _resources/port1.0/group/compilers-1.0.tcl
</span> if { ${os.major} < 10 } {
set gcc_version 7
} else {
</pre><pre style='margin:0'>
</pre>