<pre style='margin:0'>
David Strubbe (dstrubbe) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7f255d5fc977bedaf32dfb0dd013bacd52632dfc">https://github.com/macports/macports-ports/commit/7f255d5fc977bedaf32dfb0dd013bacd52632dfc</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 7f255d5 compilers portgroup: List available Fortran variants in error message.
</span>7f255d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7f255d5fc977bedaf32dfb0dd013bacd52632dfc
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Sun Jul 22 16:52:07 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> compilers portgroup: List available Fortran variants in error message.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also: Don't add variants to list twice. Remove useless ui_err line, accidentally added previously.
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 11 ++---------
1 file changed, 2 insertions(+), 9 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 c7fe982..08e07bd 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;'>@@ -196,6 +196,7 @@ proc compilers.setup_variants {variants} {
</span> global compilers.variants_conflict
global compilers.clear_archflags
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set compilers.my_fortran_variants {}
</span> foreach variant $variants {
if {$cdb($variant,f77) ne ""} {
lappend compilers.my_fortran_variants $variant
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -315,7 +316,6 @@ proc fortran_active_variant_name {depspec} {
</span> if {![catch {set result [active_variants $depspec $fc ""]}]} {
if {$result} {
return $fc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_err "$depsec +fc"
</span> }
} else {
ui_warn "fortran_active_variant_name: \[active_variants $depspec $fc \"\"\] fails."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -614,13 +614,6 @@ proc compilers.setup {args} {
</span> }
set compilers.variants [lsort [concat [remove_from_list $remove_list $duplicates] $add_list]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # also update compilers.my_fortran_variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers.my_fortran_variants {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach variant ${compilers.variants} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$cdb($variant,f77) ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers.my_fortran_variants $variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> compilers.setup_variants ${compilers.variants}
# reverse the gcc list so that the higher numbered ones are default
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -657,7 +650,7 @@ proc compilers.setup {args} {
</span> # this might also need to be in pre-archivefetch
pre-fetch {
if {${compilers.require_fortran} && [fortran_variant_name] eq ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "must set at least one Fortran variant (e.g. +gfortran, +gccX, +g95)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "must set at least one Fortran variant (${compilers.my_fortran_variants})"
</span> }
compilers.action_enforce_c ${compilers.required_c}
compilers.action_enforce_f ${compilers.required_f}
</pre><pre style='margin:0'>
</pre>