<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.4
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/ea87296c642f38920f04ce906c424dc954c686d9">https://github.com/macports/macports-base/commit/ea87296c642f38920f04ce906c424dc954c686d9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ea87296c642f38920f04ce906c424dc954c686d9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Apr 10 09:53:24 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> Fix compiler selection on Leopard and Tiger
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Rework of 7cf76ec.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't use macports-clang when targeting ppc, as it does not work for
</span><span style='display:block; white-space:pre;color:#404040;'> that arch. Add macports-gcc for ppc instead. Drop gcc-3.3 on i386,
</span><span style='display:block; white-space:pre;color:#404040;'> since it only works for ppc.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 15a4eeb3618d289b3d92093186b5f20a60e43ff0)
</span>---
src/port1.0/portconfigure.tcl | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 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 12b2749..a182578 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;'>@@ -487,14 +487,31 @@ proc portconfigure::get_compiler_fallback {} {
</span>
# Legacy cases
if {[vercmp $xcodeversion 4.0] < 0} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set canonical_archs [get_canonical_archs]
</span> if {[vercmp $xcodeversion 3.2] >= 0} {
if {[string match *10.4u* ${configure.sdkroot}]} {
return {gcc-4.0}
}
} elseif {[vercmp $xcodeversion 3.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.4 macports-clang-3.3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"ppc" in $canonical_archs || "ppc64" in $canonical_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-gcc-6 macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {gcc-4.2 apple-gcc-4.2 gcc-4.0 macports-clang-3.4 macports-clang-3.3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return {apple-gcc-4.2 gcc-4.0 gcc-3.3 macports-clang-3.3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 2.x (Tiger)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"ppc" in $canonical_archs || "ppc64" in $canonical_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"i386" in $canonical_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {apple-gcc-4.2 gcc-4.0 macports-gcc-6 macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ppc only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {apple-gcc-4.2 gcc-4.0 gcc-3.3 macports-gcc-6 macports-gcc-7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # i386 only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return {apple-gcc-4.2 gcc-4.0 macports-clang-3.3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>