Changes between Version 75 and Version 76 of PortfileRecipes

Timestamp:

Aug 27, 2013, 7:47:19 PM (11 years ago)

Author:

jeremyhu (Jeremy Huddleston Sequoia)

Comment:

Update fortran recipe to honor conflicts

PortfileRecipes

@@ -473 +473 @@
 set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
 set default_fortran_variant +gcc48
+set g95_conflicts {}
 
 foreach ver ${gcc_versions} {
     set ver_no_dot [join [split ${ver} "."] ""]
 
-    variant gcc${ver_no_dot} description {build with gfortran from gcc${ver_no_dot}} {}
-
-    variant gcc${ver_no_dot} conflicts g95 {}
-    variant g95 conflicts gcc${ver_no_dot} {}
+    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
 
     foreach over ${gcc_versions} {
@@ -488 +486 @@
 
         set over_no_dot [join [split ${over} "."] ""]
-        variant gcc${ver_no_dot} conflicts gcc${over_no_dot} {}
-    }
+        append variant_line " conflicts gcc${over_no_dot}"
+    }
+    append variant_line { {}}
+
+    eval $variant_line
+
+    append g95_conflicts " conflicts gcc${ver_no_dot}"
 
     if {[variant_isset gcc${ver_no_dot}]} {
@@ -498 +501 @@
 }
 
-variant g95 description {build with g95} {}
+eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
 
 if {[variant_isset g95]} {