Revision

75744

Author

jmr@macports.org

Date

2011-02-06 15:41:57 -0800 (Sun, 06 Feb 2011)

Log Message

fftw, fftw-single: only enable MPI support in a variant that depends on mpich2 (#28294)

Modified Paths

• trunk/dports/math/fftw/Portfile
• trunk/dports/math/fftw-single/Portfile

Diff

--- trunk/dports/math/fftw/Portfile	2011-02-06 19:23:17 UTC (rev 75743)
+++ trunk/dports/math/fftw/Portfile	2011-02-06 23:41:57 UTC (rev 75744)
@@ -31,7 +31,7 @@
 		rmd160 723308722d76c12710db6473979adf8d086b0909
 configure.args	--enable-type-prefix --enable-threads \
 		--disable-fortran --infodir=${prefix}/share/info \
-		--enable-shared --enable-mpi
+		--enable-shared
 
 variant fortran requires g95 description {obsolete synonym for g95} {}
 
@@ -73,3 +73,8 @@
         xinstall -m 644 ${worksrcpath}/fortran/fftw_f77.i ${destroot}${prefix}/include
     }
 }
+
+variant mpi description {Include FFTW MPI library} {
+    depends_lib-append port:mpich2
+    configure.args-append --enable-mpi
+}

--- trunk/dports/math/fftw-single/Portfile	2011-02-06 19:23:17 UTC (rev 75743)
+++ trunk/dports/math/fftw-single/Portfile	2011-02-06 23:41:57 UTC (rev 75744)
@@ -39,8 +39,7 @@
 		--enable-float		\
 		--disable-fortran	\
 		--infodir=${prefix}/share/info \
-		--enable-shared \
-		--enable-mpi
+		--enable-shared
 
 variant g95 conflicts gcc42 gcc43 gcc44 gcc45 description {include fortran-callable wrappers built with g95} {
 	depends_lib-append	port:g95
@@ -78,6 +77,11 @@
     }
 }
 
+variant mpi description {Include FFTW MPI library} {
+    depends_lib-append port:mpich2
+    configure.args-append --enable-mpi
+}
+
 # Documentation conflicts with the double precision version,
 # so delete it. The documentation is installed by the dependency
 # port:fftw, above.