<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/b5737f936aa076bcf1196dd840ef64e312494478">https://github.com/macports/macports-ports/commit/b5737f936aa076bcf1196dd840ef64e312494478</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 b5737f9 gcc{9,10}: Handle case when cctools has xcode variant active
</span>b5737f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b5737f936aa076bcf1196dd840ef64e312494478
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu May 9 21:15:10 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc{9,10}: Handle case when cctools has xcode variant active
</span>---
lang/gcc10/Portfile | 38 ++++++++++++++++++++++----------------
lang/gcc9/Portfile | 38 ++++++++++++++++++++++----------------
2 files changed, 44 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/Portfile b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7278918..9dffff6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,23 +101,29 @@ configure.env-append \
</span> if { ${os.major} > 10 } {
if {![catch {set installed [lindex [registry_active cctools] 0]}]} {
# cctools already installed, so figure out from registry what variant to use
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # list here must have all possible variants from cctools in it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_variant_found "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {llvm_v llvm_v_nodot} {3.4 34 3.7 37 3.9 39 4.0 40 5.0 50 6.0 60 7.0 70 8.0 80 devel dev} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants cctools llvm${llvm_v_nodot} ""]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_variant_found "yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If we failed to find the active variant, error out as it could mean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # above variant list is out of date.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${llvm_variant_found} eq "no" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Failed to determine active llvm variant for cctools. Please check variant list."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "configuration error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # First, is xcode variant in use ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants cctools xcode ""]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # xcode variant is in use. Warn (as no longer the default) but accept as should still work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "cctools has (non default) xcode variant active. Consider reinstalling cctools using default variants."
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: cctools has llvm variant ${llvm_v} active"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # llvm variant list here must have all possible variants from cctools in it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_variant_found "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {llvm_v llvm_v_nodot} {3.4 34 3.7 37 3.9 39 4.0 40 5.0 50 6.0 60 7.0 70 8.0 80 devel dev} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants cctools llvm${llvm_v_nodot} ""]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.compiler macports-clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_variant_found "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If we failed to find the active variant, error out as it could mean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # above variant list is out of date.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${llvm_variant_found} eq "no" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Failed to determine active llvm variant for cctools. Please check variant list."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "configuration error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${subport}: cctools has llvm variant ${llvm_v} active"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
} else {
# cctools is not yet installed, so have to play 'guess the default variant' :(
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4883344..e4f9dcd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,23 +106,29 @@ configure.env-append \
</span> if { ${os.major} > 10 } {
if {![catch {set installed [lindex [registry_active cctools] 0]}]} {
# cctools already installed, so figure out from registry what variant to use
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # list here must have all possible variants from cctools in it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_variant_found "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {llvm_v llvm_v_nodot} {3.4 34 3.7 37 3.9 39 4.0 40 5.0 50 6.0 60 7.0 70 8.0 80 devel dev} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants cctools llvm${llvm_v_nodot} ""]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_variant_found "yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If we failed to find the active variant, error out as it could mean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # above variant list is out of date.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${llvm_variant_found} eq "no" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Failed to determine active llvm variant for cctools. Please check variant list."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "configuration error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # First, is xcode variant in use ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants cctools xcode ""]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # xcode variant is in use. Warn (as no longer the default) but accept as should still work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "cctools has (non default) xcode variant active. Consider reinstalling cctools using default variants."
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: cctools has llvm variant ${llvm_v} active"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # llvm variant list here must have all possible variants from cctools in it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_variant_found "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {llvm_v llvm_v_nodot} {3.4 34 3.7 37 3.9 39 4.0 40 5.0 50 6.0 60 7.0 70 8.0 80 devel dev} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[active_variants cctools llvm${llvm_v_nodot} ""]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.compiler macports-clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_variant_found "yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If we failed to find the active variant, error out as it could mean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # above variant list is out of date.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${llvm_variant_found} eq "no" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Failed to determine active llvm variant for cctools. Please check variant list."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "configuration error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "${subport}: cctools has llvm variant ${llvm_v} active"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
} else {
# cctools is not yet installed, so have to play 'guess the default variant' :(
</pre><pre style='margin:0'>
</pre>