<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.6
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/e2137efe34a14947c85081018d8670d47b124e34">https://github.com/macports/macports-base/commit/e2137efe34a14947c85081018d8670d47b124e34</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e2137efe34a14947c85081018d8670d47b124e34
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 24 15:51:31 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> Don't check the version of apple-gcc-4.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It's provided by a port and so can be assumed to be the latest version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59089
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit a3a71b5b1b1f83e8cf35d45038a564906dcea8f0)
</span>---
src/macports1.0/macports.tcl | 3 +--
src/port1.0/portconfigure.tcl | 5 +++++
2 files changed, 6 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5744056..6b11a1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5387,8 +5387,7 @@ proc macports::get_compiler_version {compiler} {
</span> set re {LLVM build ([0-9.]+)}
}
gcc-4.2 -
<span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-4.0 -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- apple-gcc-4.2 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc-4.0 {
</span> set re {build ([0-9.]+)}
}
default {
<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 636a17c..dfbe0b6 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;'>@@ -1031,6 +1031,11 @@ proc portconfigure::get_compiler_fallback {} {
</span> }
set system_compilers ""
foreach c ${available_apple_compilers} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$c eq "apple-gcc-4.2"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # provided by a port, should be the latest version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend system_compilers $c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> set vmin [portconfigure::get_min_command_line $c]
if {$vmin ne "none"} {
set v [compiler.command_line_tools_version $c]
</pre><pre style='margin:0'>
</pre>