[35330] trunk/dports/science/openmpi/Portfile

[mww at macports.org]

Revision: 35330
          http://trac.macosforge.org/projects/macports/changeset/35330
Author:   mww at macports.org
Date:     2008-03-25 06:12:06 -0700 (Tue, 25 Mar 2008)

Log Message:
-----------
allow selection of fortran compiler -- #14638

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

Modified: trunk/dports/science/openmpi/Portfile
===================================================================
--- trunk/dports/science/openmpi/Portfile	2008-03-25 13:03:46 UTC (rev 35329)
+++ trunk/dports/science/openmpi/Portfile	2008-03-25 13:12:06 UTC (rev 35330)
@@ -44,38 +44,44 @@
 post-destroot {
 	foreach bin {mpirun mpiexec} {
 		system "cd ${destroot}${prefix}/bin \
-			&& ln -sf ${prefix}/lib/${name}/bin/orterun open${bin}" 
+			&& ln -sf ${prefix}/lib/${name}/bin/orterun open${bin}"
 	}
 	foreach bin ${wrappers} {
 		system "cd ${destroot}${prefix}/bin \
-			&& ln -sf ${prefix}/lib/${name}/bin/opal_wrapper open${bin}" 
+			&& ln -sf ${prefix}/lib/${name}/bin/opal_wrapper open${bin}"
 		system "cd ${destroot}${prefix}/share/${name} \
 		&& ln -sf ${prefix}/share/${name}/${bin}-wrapper-data.txt \
 			open${bin}-wrapper-data.txt"
 	}
 }
 
-variant fortran {
-        configure.args-delete --disable-f77 --disable-f90
-        configure.args-append --enable-f77 --enable-f90
-        configure.f77	${prefix}/bin/gfortran-mp-4.2
-	configure.fc	${prefix}/bin/gfortran-mp-4.2
-        # We need gfortran. Gcc41 doesn't seem to compile on Intel Mac, so we'll take  
-        # gcc42. Too bad that the actual gfortran binary in gcc42 is called
-        # gfortran-mp-4.2, otherwise we could just say bin:gfortran:gcc42.
-        depends_build port:gcc42
+variant gcc42 description {build mpif77 and mpif90 using gcc42} conflicts gcc43 g95 {
+	configure.args-delete --disable-f77 --disable-f90
+	configure.args-append --enable-f77 --enable-f90
+	configure.f77	      ${prefix}/bin/gfortran-mp-4.2
+	configure.fc	      ${prefix}/bin/gfortran-mp-4.2
+	depends_lib-append    port:gcc42
 	lappend wrappers mpif77 mpif90
 }
 
-variant g95 {
+variant gcc43 description {build mpif77 and mpif90 using gcc43} conflicts gcc42 g95 {
 	configure.args-delete --disable-f77 --disable-f90
 	configure.args-append --enable-f77 --enable-f90
-	configure.f77	${prefix}/bin/g95
-	configure.fc	${prefix}/bin/g95
-	depends_build	port:g95
+	configure.f77	      ${prefix}/bin/gfortran-mp-4.3
+	configure.fc	      ${prefix}/bin/gfortran-mp-4.3
+	depends_lib-append    port:gcc43
 	lappend wrappers mpif77 mpif90
 }
 
+variant g95 description {build mpif77 and mpif90 using g95} conflicts gcc43 g95 {
+	configure.args-delete --disable-f77 --disable-f90
+	configure.args-append --enable-f77 --enable-f90
+	configure.f77	      ${prefix}/bin/g95
+	configure.fc	      ${prefix}/bin/g95
+	depends_lib-append    port:g95
+	lappend wrappers mpif77 mpif90
+}
+
 livecheck.check	regex
 livecheck.url	http://www.open-mpi.org/software/
 livecheck.regex	openmpi-(\[0-9\.\]+).tar.bz2

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080325/ab771259/attachment.html