[116361] trunk/dports/science/raxml/Portfile

[sean at macports.org]

Revision: 116361
          https://trac.macports.org/changeset/116361
Author:   sean at macports.org
Date:     2014-01-23 12:13:35 -0800 (Thu, 23 Jan 2014)
Log Message:
-----------
raxml: use mpi portgroup

Modified Paths:
--------------
    trunk/dports/science/raxml/Portfile

Modified: trunk/dports/science/raxml/Portfile
===================================================================
--- trunk/dports/science/raxml/Portfile	2014-01-23 20:13:32 UTC (rev 116360)
+++ trunk/dports/science/raxml/Portfile	2014-01-23 20:13:35 UTC (rev 116361)
@@ -3,7 +3,11 @@
 
 PortSystem          1.0
 PortGroup           github 1.0
+PortGroup           mpi 1.0
 
+compilers.choose    cc
+mpi.setup
+
 github.setup        stamatak standard-RAxML 7.7.6 v
 checksums           sha256  7562b307bc50e38162f104271793a1c8f98f866c2342bea21afe6df6a982fd82 \
                     rmd160  da76d6623515b7d8f78a69aaf4eec713508789af
@@ -28,28 +32,30 @@
 
 #Use the HYBRID implementation
 
-variant hybrid conflicts pthreads mpi description {Hybrid MPI implementation} {
-    depends_lib-append  port:openmpi
+variant hybrid conflicts pthreads description {Hybrid MPI implementation} {
+    if {![mpi_variant_isset]} {
+        return -code error "$name: Variant hybrid requires an mpi variant"
+    }
     set HPCm ".HYBRID"
     set HPCb "-HYBRID"
-    configure.cc        ${prefix}/bin/openmpicc
 }
 
-#Use the MPI implementation
-variant mpi conflicts pthreads hybrid description {MPI implementation} {
-    depends_lib-append  port:openmpi
+#Use the MPI implementation if hybrid is not selected
+if {[mpi_variant_isset] && ![variant_isset hybrid]} {
     set HPCm ".MPI"
     set HPCb "-MPI"
-    configure.cc        ${prefix}/bin/openmpicc
 }
 
 #Use the pthreads implementation (default)
-variant pthreads conflicts mpi hybrid description {Pthreads implementation} {
+variant pthreads conflicts hybrid description {Pthreads implementation} {
+    if {[mpi_variant_isset]} {
+        return -code error "$name: Variant pthreads conflicts with mpi"
+    }
     set HPCm ".PTHREADS"
     set HPCb "-PTHREADS"
 }
 
-if {![variant_isset mpi]} {
+if {![mpi_variant_isset]} {
     default_variants    +pthreads
 }
 
@@ -61,6 +67,11 @@
     }
 
     variant avx conflicts sse3 description {Use the AVX extended instruction set from Intel i7 (sandy bridge) and AMD Bulldozer} {
+        pre-fetch {
+            if {![avx_compiler_isset]} {
+                return -code error "$name: Variant avx needs a clang-derived compiler"
+            }
+        }
         set EXTm ".AVX"
         set EXTb "-AVX"
     }
@@ -80,10 +91,6 @@
     }
 }
 
-#Pass in architecture information
-build.args              EXTRA_CFLAGS="${configure.cc_archflags}" \
-                        LDFLAGS="${configure.ld_archflags}"
-
 #Make sure we are using the correct Makefile for this variant combo
 pre-build {
     build.pre_args      -f Makefile${EXTm}${HPCm}.gcc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140123/20a8d8ca/attachment-0001.html>