<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/02845d3303cf3ec8f62be0ab4d2e764e431692d0">https://github.com/macports/macports-ports/commit/02845d3303cf3ec8f62be0ab4d2e764e431692d0</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 02845d3  compilers portgroup: update compilers.fortran_variants
</span>02845d3 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 02845d3303cf3ec8f62be0ab4d2e764e431692d0
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jun 12 23:09:37 2018 +1000

<span style='display:block; white-space:pre;color:#404040;'>    compilers portgroup: update compilers.fortran_variants
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    compilers.setup changes compilers.variants based on which compilers have
</span><span style='display:block; white-space:pre;color:#404040;'>    been chosen, but it neglected to also update compilers.fortran_variants
</span><span style='display:block; white-space:pre;color:#404040;'>    in the same way. This led to incorrect information being returned by at
</span><span style='display:block; white-space:pre;color:#404040;'>    least the fortran_variant_name proc, in the case that a variant was
</span><span style='display:block; white-space:pre;color:#404040;'>    requested but didn't actually exist in the port.
</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/56582
</span>---
 _resources/port1.0/group/compilers-1.0.tcl | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 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 f7ccc7c..bfcf897 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;'>@@ -523,11 +523,9 @@ proc compilers.action_enforce_some_f {ports} {
</span> }
 
 proc compilers.setup {args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    global cdb compilers.variants compilers.clang_variants compilers.gcc_variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global compilers.fortran_variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global compilers.require_fortran compilers.default_fortran compilers.setup_done compilers.list
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global compilers.gcc_default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    global compiler.blacklist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global cdb compilers.variants compilers.clang_variants compilers.gcc_variants \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        compilers.fortran_variants compilers.require_fortran compilers.default_fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        compilers.setup_done compilers.list compilers.gcc_default compiler.blacklist
</span> 
     if {!${compilers.setup_done}} {
         set add_list {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -611,6 +609,13 @@ 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:#e0ffe0;'>+        # also update compilers.fortran_variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set compilers.fortran_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach variant ${compilers.variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {$cdb($variant,f77) ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                lappend compilers.fortran_variants $variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>         compilers.setup_variants ${compilers.variants}
 
         # reverse the gcc list so that the higher numbered ones are default
</pre><pre style='margin:0'>

</pre>