Ticket #38319: Portfile-openmpi.diff2

File Portfile-openmpi.diff2, 3.5 KB (added by dstrubbe (David Strubbe), 11 years ago)
Line 
1--- Portfile.orig       2013-06-06 15:05:21.000000000 -0400
2+++ Portfile    2013-06-06 15:02:43.000000000 -0400
3@@ -63,6 +63,8 @@
4        }
5 }
6 
7+conflicts       mpich mpich2 mpich3 lammpi mpich-devel mpich3-devel
8+
9 variant threads description {enable threads for MPI applications} {
10        configure.args-append --enable-mpi-thread-multiple
11 }
12@@ -72,7 +74,7 @@
13        configure.args-append --enable-debug --enable-memchecker --with-valgrind=${prefix}
14 }
15 
16-variant gcc43 description {build mpif77 and mpif90 using gcc43} conflicts gcc44 gcc45 gcc46 gcc47 gcc48 g95 {
17+variant gcc43 description {build openmpif77 and openmpif90 using gcc43} conflicts gcc44 gcc45 gcc46 gcc47 gcc48 g95 {
18        configure.args-delete --disable-mpi-f77 --disable-mpi-f90
19        configure.args-append --enable-mpi-f77 --enable-mpi-f90
20        configure.f77         ${prefix}/bin/gfortran-mp-4.3
21@@ -81,7 +83,7 @@
22        lappend wrappers mpif77 mpif90
23 }
24 
25-variant gcc44 description {build mpif77 and mpif90 using gcc44} conflicts gcc43 gcc45 gcc46 gcc47 gcc48 g95 {
26+variant gcc44 description {build openmpif77 and openmpif90 using gcc44} conflicts gcc43 gcc45 gcc46 gcc47 gcc48 g95 {
27        configure.args-delete --disable-mpi-f77 --disable-mpi-f90
28        configure.args-append --enable-mpi-f77 --enable-mpi-f90
29        configure.f77         ${prefix}/bin/gfortran-mp-4.4
30@@ -90,7 +92,7 @@
31        lappend wrappers mpif77 mpif90
32 }
33 
34-variant gcc45 description {build mpif77 and mpif90 using gcc45} conflicts gcc43 gcc44 gcc46 gcc47 gcc48 g95 {
35+variant gcc45 description {build openmpif77 and openmpif90 using gcc45} conflicts gcc43 gcc44 gcc46 gcc47 gcc48 g95 {
36        configure.args-delete --disable-mpi-f77 --disable-mpi-f90
37        configure.args-append --enable-mpi-f77 --enable-mpi-f90
38        configure.f77         ${prefix}/bin/gfortran-mp-4.5
39@@ -99,7 +101,7 @@
40        lappend wrappers mpif77 mpif90
41 }
42 
43-variant gcc46 description {build mpif77 and mpif90 using gcc46} conflicts gcc43 gcc44 gcc45 gcc47 gcc48 g95 {
44+variant gcc46 description {build openmpif77 and openmpif90 using gcc46} conflicts gcc43 gcc44 gcc45 gcc47 gcc48 g95 {
45        configure.args-delete --disable-mpi-f77 --disable-mpi-f90
46        configure.args-append --enable-mpi-f77 --enable-mpi-f90
47        configure.f77         ${prefix}/bin/gfortran-mp-4.6
48@@ -108,7 +110,7 @@
49        lappend wrappers mpif77 mpif90
50 }
51 
52-variant gcc47 description {build mpif77 and mpif90 using gcc47} conflicts gcc43 gcc44 gcc45 gcc46 gcc48 g95 {
53+variant gcc47 description {build openmpif77 and openmpif90 using gcc47} conflicts gcc43 gcc44 gcc45 gcc46 gcc48 g95 {
54        configure.args-delete --disable-mpi-f77 --disable-mpi-f90
55        configure.args-append --enable-mpi-f77 --enable-mpi-f90
56        configure.f77         ${prefix}/bin/gfortran-mp-4.7
57@@ -117,7 +119,7 @@
58        lappend wrappers mpif77 mpif90
59 }
60 
61-variant gcc48 description {build mpif77 and mpif90 using gcc48} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 {
62+variant gcc48 description {build openmpif77 and openmpif90 using gcc48} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 g95 {
63        configure.args-delete --disable-mpi-f77 --disable-mpi-f90
64        configure.args-append --enable-mpi-f77 --enable-mpi-f90
65        configure.f77         ${prefix}/bin/gfortran-mp-4.8
66@@ -126,7 +128,7 @@
67        lappend wrappers mpif77 mpif90
68 }
69 
70-variant g95 description {build mpif77 and mpif90 using g95} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 {
71+variant g95 description {build openmpif77 and openmpif90 using g95} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 {
72        configure.args-delete --disable-mpi-f77 --disable-mpi-f90
73        configure.args-append --enable-mpi-f77 --enable-mpi-f90
74        configure.f77         ${prefix}/bin/g95