[116308] trunk/dports/_resources/port1.0/group/compilers-1.0.tcl

[sean at macports.org]

Revision: 116308
          https://trac.macports.org/changeset/116308
Author:   sean at macports.org
Date:     2014-01-23 12:09:12 -0800 (Thu, 23 Jan 2014)
Log Message:
-----------
compilers-1.0: also check default_variants in *_variant_isset

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/compilers-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/compilers-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/compilers-1.0.tcl	2014-01-23 20:09:07 UTC (rev 116307)
+++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl	2014-01-23 20:09:12 UTC (rev 116308)
@@ -279,7 +279,8 @@
 }
 
 foreach variant ${compilers.gcc_variants} {
-    if {[variant_isset $variant]} {
+    # we need to check the default_variants so we can't use variant_isset
+    if {[info exists variations($variant)] && $variations($variant) eq "+"} {
         depends_lib-delete      port:g95
         break
     }
@@ -328,10 +329,11 @@
 }
 
 proc fortran_variant_name {} {
-    global compilers.fortran_variants
+    global compilers.fortran_variants variations
 
     foreach fc ${compilers.fortran_variants} {
-        if {[variant_isset $fc]} {
+        # we need to check the default_variants so we can't use variant_isset
+        if {[info exists variations($fc)] && $variations($fc) eq "+"} {
             return $fc
         }
     }
@@ -340,16 +342,18 @@
 }
 
 proc clang_variant_name {} {
-    global compilers.clang_variants compilers.dragonegg_variants
+    global compilers.clang_variants compilers.dragonegg_variants variations
 
     foreach c ${compilers.clang_variants} {
-        if {[variant_isset $c]} {
+        # we need to check the default_variants so we can't use variant_isset
+        if {[info exists variations($c)] && $variations($c) eq "+"} {
             return $c
         }
     }
 
     foreach c ${compilers.dragonegg_variants} {
-        if {[variant_isset $c]} {
+        # we need to check the default_variants so we can't use variant_isset
+        if {[info exists variations($c)] && $variations($c) eq "+"} {
             return $c
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140123/64b9698b/attachment.html>