Revision

73977

Author

adfernandes@macports.org

Date

2010-11-30 14:02:00 -0800 (Tue, 30 Nov 2010)

Log Message

python/py2[67]-mpi4py: fixed dependency confusion with openmpi vs mpich2

Modified Paths

• trunk/dports/python/py26-mpi4py/Portfile
• trunk/dports/python/py27-mpi4py/Portfile

Diff

--- trunk/dports/python/py26-mpi4py/Portfile	2010-11-30 22:01:06 UTC (rev 73976)
+++ trunk/dports/python/py26-mpi4py/Portfile	2010-11-30 22:02:00 UTC (rev 73977)
@@ -33,7 +33,7 @@
 
 depends_lib-append port:mpich2
 
-# mpich2 is not universal
+# mpich2 and openmpi are not universal
 universal_variant no
 
 if { ${os.major} < 9 } {
@@ -46,6 +46,7 @@
 
 variant openmpi description {builds with the openmpi port} {
     depends_lib-append  port:openmpi
+    depends_lib-delete  port:mpich2
     build.target        build "--mpicc=${prefix}/bin/openmpicc"
 }
 

--- trunk/dports/python/py27-mpi4py/Portfile	2010-11-30 22:01:06 UTC (rev 73976)
+++ trunk/dports/python/py27-mpi4py/Portfile	2010-11-30 22:02:00 UTC (rev 73977)
@@ -33,7 +33,7 @@
 
 depends_lib-append port:mpich2
 
-# mpich2 is not universal
+# mpich2 and openmpi are not universal
 universal_variant no
 
 if { ${os.major} < 9 } {
@@ -46,6 +46,7 @@
 
 variant openmpi description {builds with the openmpi port} {
     depends_lib-append  port:openmpi
+    depends_lib-delete  port:mpich2
     build.target        build "--mpicc=${prefix}/bin/openmpicc"
 }