[142511] trunk/dports/_resources/port1.0/group/mpi-1.0.tcl

[dstrubbe at macports.org]

Revision: 142511
          https://trac.macports.org/changeset/142511
Author:   dstrubbe at macports.org
Date:     2015-11-13 09:30:50 -0800 (Fri, 13 Nov 2015)
Log Message:
-----------
mpi portgroup: Fix mpi Fortran variant enforcement -- it should be run whenever a Fortran variant is selected, not just if Fortran is required; take into account +fortran variants from gcc subports and how default/clang/llvm subports have +gccX not +gfortran; give accurate recommendation of what needs to be installed. Also, improve documentation.

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

Modified: trunk/dports/_resources/port1.0/group/mpi-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/mpi-1.0.tcl	2015-11-13 17:14:42 UTC (rev 142510)
+++ trunk/dports/_resources/port1.0/group/mpi-1.0.tcl	2015-11-13 17:30:50 UTC (rev 142511)
@@ -48,10 +48,12 @@
 #   Whether an MPI variant has been set.
 # proc mpi.setup {args}
 #   Creates MPI variants.
-#   Available arguments: "require" means an MPI variant must be set. "-mpich", "-openmpi", etc.
-#   means remove this variant from the list. All of the arguments for compilers.setup are available
-#   too and will be passed to that procedure. "default" means an MPI variant (mpich) will be
-#   set as a default variant.
+#   Available arguments: "require" means an MPI variant must be set.
+#   All of the arguments for compilers.setup are available too and will be passed to that procedure.
+#   "default" means an MPI variant (mpich) will be set as a default variant.
+#   You can either list which MPI's can be used (e.g. mpich mpich-devel),
+#   which cannot be used (e.g. -mpich -openmpi-devel).
+#   There are four MPI variants: mpich, mpich-devel, openmpi, openmpi-devel.
 
 PortGroup compilers 1.0
 
@@ -160,6 +162,8 @@
             if {$result} {
                 return $m
             }
+        } else {
+            # warning or error!
         }
     }
 
@@ -203,19 +207,45 @@
             }
 
             eval compilers.action_enforce_c $portname
+        } else {
+            # warning or error!
         }
     }
 }
 
 # only run this if mpi is chosen
 pre-fetch {
-    if {${compilers.require_fortran} && [mpi_variant_isset]} {
-        set mpif [fortran_active_variant_name ${mpi.name}]
-        set myf  [fortran_variant_name]
+    if {[fortran_variant_isset] && [mpi_variant_isset]} {
+        set gcc_name ""
+        regexp (gcc\[0-9\]*) ${mpi.name} gcc_name 
+        if {$gcc_name ne ""} {
+            if {[active_variants ${mpi.name} "fortran" ""]} {
+                set mpif $gcc_name
+            } else {
+                set mpif ""
+            }
+        } else {
+            # this is a default, clang, or llvm subport
+            set mpif [fortran_active_variant_name ${mpi.name}]
+            
+        }
+        # mpif will definitely have a real compiler name, not gfortran.
+        set myf [fortran_compiler_name [fortran_variant_name]]
 
-        if {[fortran_compiler_name $myf] ne [fortran_compiler_name $mpif]} {
-            ui_error "${mpi.name} has a different fortran variant ($mpif) than the selected $myf"
-            return -code error "${mpi.name} needs the $myf variant"
+        if {$myf ne $mpif} {
+            if {$mpif eq "" && $gcc_name ne ""} {
+                ui_error "${mpi.name} was built without Fortran support."
+                set need "fortran"
+            } else {
+                if {[fortran_variant_name] eq "gfortran"} {
+                    set selectedf " (via +gfortran)"
+                } else {
+                    set selectedf " "
+                }
+                ui_error "${mpi.name} has a different Fortran variant ($mpif) than the one selected, $myf$selectedf."
+                set need $myf
+            }
+            return -code error "Install ${mpi.name} +$need"
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/aae4b7da/attachment-0001.html>