<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/e3fed36dd01cf46b484f16d6cbaf67a4ba2f8c07">https://github.com/macports/macports-ports/commit/e3fed36dd01cf46b484f16d6cbaf67a4ba2f8c07</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 e3fed36  compilers portgroup: Fix bug in enforce_some_fortran.
</span>e3fed36 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit e3fed36dd01cf46b484f16d6cbaf67a4ba2f8c07
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Wed Jul 4 12:19:33 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    compilers portgroup: Fix bug in enforce_some_fortran.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    +gfortran would not be recognized in a dependent port if it was not a variant of the port being built. A full fortran variant list, not reduced according to any properties of the current port, is now used for operating on a dependent.
</span>---
 _resources/port1.0/group/compilers-1.0.tcl | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 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 671e8b1..712febf 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;'>@@ -53,7 +53,8 @@ PortGroup active_variants 1.1
</span> 
 options compilers.variants compilers.gcc_variants compilers.clear_archflags
 default compilers.variants {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default compilers.fortran_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compilers.my_fortran_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compilers.all_fortran_variants {}
</span> default compilers.gcc_variants {}
 default compilers.clang_variants {}
 default compilers.require_fortran 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +179,7 @@ foreach cname [array names cdb *,variant] {
</span> 
 foreach variant ${compilers.variants} {
     if {$cdb($variant,f77) ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        lappend compilers.fortran_variants $variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        lappend compilers.all_fortran_variants $variant
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,13 +191,13 @@ proc compilers.set_variants_conflict {args} {
</span> 
 proc compilers.setup_variants {variants} {
     global cdb compilers.variants compilers.clang_variants compilers.gcc_variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    global compilers.fortran_variants compilers.list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global compilers.my_fortran_variants compilers.list
</span>     global compilers.variants_conflict
     global compilers.clear_archflags
 
     foreach variant $variants {
         if {$cdb($variant,f77) ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            lappend compilers.fortran_variants $variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lappend compilers.my_fortran_variants $variant
</span>         }
 
         if {[variant_exists $variant]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -305,12 +306,15 @@ proc c_variant_isset {} {
</span> }
 
 proc fortran_active_variant_name {depspec} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    global compilers.fortran_variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#note: this list of variants is NOT reduced by an characteristics of the current port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#(unlike compilers.my_fortran_variants), since it needs to apply to another port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global compilers.all_fortran_variants
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    foreach fc ${compilers.fortran_variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach fc ${compilers.all_fortran_variants} {
</span>         if {![catch {set result [active_variants $depspec $fc ""]}]} {
             if {$result} {
                 return $fc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                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;'>@@ -331,9 +335,9 @@ proc fortran_compiler_name {variant} {
</span> }
 
 proc fortran_variant_name {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    global compilers.fortran_variants variations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    global compilers.my_fortran_variants variations
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    foreach fc ${compilers.fortran_variants} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    foreach fc ${compilers.my_fortran_variants} {
</span>         # we need to check the default_variants so we can't use variant_isset
         if {[info exists variations($fc)] && $variations($fc) eq "+"} {
             return $fc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -524,7 +528,7 @@ proc compilers.action_enforce_some_f {ports} {
</span> 
 proc compilers.setup {args} {
     global cdb compilers.variants compilers.clang_variants compilers.gcc_variants \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        compilers.fortran_variants compilers.require_fortran compilers.default_fortran \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        compilers.my_fortran_variants compilers.require_fortran compilers.default_fortran \
</span>         compilers.setup_done compilers.list compilers.gcc_default compiler.blacklist
 
     if {!${compilers.setup_done}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -536,7 +540,7 @@ proc compilers.setup {args} {
</span>         # we remove +clangXY
         if {[compilers.is_fortran_only]} {
             # remove gfortran since that only exists to "complete" clang/llvm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            set remove_list [remove_from_list ${compilers.fortran_variants} gfortran]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set remove_list [remove_from_list ${compilers.my_fortran_variants} gfortran]
</span>         } elseif {[compilers.is_c_only]} {
             # remove gfortran and g95 since those are purely for fortran
             set remove_list [remove_from_list ${compilers.variants} {gfortran g95}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -609,11 +613,11 @@ 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.fortran_variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        set compilers.fortran_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # also update compilers.my_fortran_variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set compilers.my_fortran_variants {}
</span>         foreach variant ${compilers.variants} {
             if {$cdb($variant,f77) ne ""} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                lappend compilers.fortran_variants $variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                lappend compilers.my_fortran_variants $variant
</span>             }
         }
         compilers.setup_variants ${compilers.variants}
</pre><pre style='margin:0'>

</pre>