[112333] trunk/dports
eborisch at macports.org
eborisch at macports.org
Fri Oct 18 20:21:13 PDT 2013
Revision: 112333
https://trac.macports.org/changeset/112333
Author: eborisch at macports.org
Date: 2013-10-18 20:21:13 -0700 (Fri, 18 Oct 2013)
Log Message:
-----------
mpich[-devel] and selected dependents: Make sure mpiexec-mp exists with or without +gforker. Use mpiexec-mp (not mpiexec-mp.hydra) for those ports that use mpiexec.
Modified Paths:
--------------
trunk/dports/graphics/vtk-devel/Portfile
trunk/dports/math/petsc/Portfile
trunk/dports/science/hpl/Portfile
trunk/dports/science/mpich/Portfile
trunk/dports/science/mpich/files/mpich-clang
trunk/dports/science/mpich/files/mpich-clang-fortran
trunk/dports/science/mpich/files/mpich-clang31
trunk/dports/science/mpich/files/mpich-clang31-fortran
trunk/dports/science/mpich/files/mpich-clang32
trunk/dports/science/mpich/files/mpich-clang32-fortran
trunk/dports/science/mpich/files/mpich-clang33
trunk/dports/science/mpich/files/mpich-clang33-fortran
trunk/dports/science/mpich/files/mpich-clang34
trunk/dports/science/mpich/files/mpich-clang34-fortran
trunk/dports/science/mpich/files/mpich-gcc43-fortran
trunk/dports/science/mpich/files/mpich-gcc44-fortran
trunk/dports/science/mpich/files/mpich-gcc45-fortran
trunk/dports/science/mpich/files/mpich-gcc46-fortran
trunk/dports/science/mpich/files/mpich-gcc47-fortran
trunk/dports/science/mpich/files/mpich-gcc48-fortran
trunk/dports/science/mpich/files/mpich-gcc49-fortran
trunk/dports/science/mpich/files/mpich-llvm
trunk/dports/science/mpich/files/mpich-llvm-fortran
trunk/dports/science/mpich/files/mpich-mp
trunk/dports/science/mpich/files/mpich-mp-fortran
trunk/dports/science/mpich-devel/Portfile
trunk/dports/science/mpich-devel/files/mpich-clang
trunk/dports/science/mpich-devel/files/mpich-clang-fortran
trunk/dports/science/mpich-devel/files/mpich-clang31
trunk/dports/science/mpich-devel/files/mpich-clang31-fortran
trunk/dports/science/mpich-devel/files/mpich-clang32
trunk/dports/science/mpich-devel/files/mpich-clang32-fortran
trunk/dports/science/mpich-devel/files/mpich-clang33
trunk/dports/science/mpich-devel/files/mpich-clang33-fortran
trunk/dports/science/mpich-devel/files/mpich-clang34
trunk/dports/science/mpich-devel/files/mpich-clang34-fortran
trunk/dports/science/mpich-devel/files/mpich-gcc43-fortran
trunk/dports/science/mpich-devel/files/mpich-gcc44-fortran
trunk/dports/science/mpich-devel/files/mpich-gcc45-fortran
trunk/dports/science/mpich-devel/files/mpich-gcc46-fortran
trunk/dports/science/mpich-devel/files/mpich-gcc47-fortran
trunk/dports/science/mpich-devel/files/mpich-gcc48-fortran
trunk/dports/science/mpich-devel/files/mpich-gcc49-fortran
trunk/dports/science/mpich-devel/files/mpich-llvm
trunk/dports/science/mpich-devel/files/mpich-llvm-fortran
trunk/dports/science/mpich-devel/files/mpich-mp
trunk/dports/science/mpich-devel/files/mpich-mp-fortran
trunk/dports/science/octopus/Portfile
trunk/dports/sysutils/mpich_select/Portfile
trunk/dports/sysutils/mpich_select/files/base
trunk/dports/sysutils/mpich_select/files/none
Modified: trunk/dports/graphics/vtk-devel/Portfile
===================================================================
--- trunk/dports/graphics/vtk-devel/Portfile 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/graphics/vtk-devel/Portfile 2013-10-19 03:21:13 UTC (rev 112333)
@@ -764,7 +764,7 @@
configure.args-append \
-DVTK_USE_MPI:BOOL=ON \
-DMPI_COMPILER:FILEPATH=${prefix}/bin/mpicxx-mp \
- -DMPIEXEC:FILEPATH=${prefix}/bin/mpiexec.hydra-mp \
+ -DMPIEXEC:FILEPATH=${prefix}/bin/mpiexec-mp \
-DMPIEXEC_MAX_NUMPROCS:STRING=${nCPU}
# If the MPI_LIBRARY and-or MPI_INCLUDE_PATH are set, then the
# FindMPI module will not determine all the cmake variables
Modified: trunk/dports/math/petsc/Portfile
===================================================================
--- trunk/dports/math/petsc/Portfile 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/math/petsc/Portfile 2013-10-19 03:21:13 UTC (rev 112333)
@@ -79,7 +79,7 @@
--with-cc=${prefix}/bin/mpicc-mp \
--with-cxx=${prefix}/bin/mpicxx-mp \
--with-fc=${prefix}/bin/mpif90-mp \
- --with-mpiexec=${prefix}/bin/mpiexec.hydra-mp
+ --with-mpiexec=${prefix}/bin/mpiexec-mp
}
variant accelerate description {Use Accelerate framework for LAPACK} conflicts atlas {
Modified: trunk/dports/science/hpl/Portfile
===================================================================
--- trunk/dports/science/hpl/Portfile 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/hpl/Portfile 2013-10-19 03:21:13 UTC (rev 112333)
@@ -66,7 +66,7 @@
depends_lib-append path:bin/mpicc-mp:mpich-default
build.args-append CC=${prefix}/bin/mpicc-mp \
LINKER=${prefix}/bin/mpicc-mp
- test.cmd cd bin/macos && ${prefix}/bin/mpiexec.hydra-mp -n 4 ./xhpl
+ test.cmd cd bin/macos && ${prefix}/bin/mpiexec-mp -n 4 ./xhpl
}
variant atlas conflicts accelerate description {Use ATLAS for BLAS library} {
Modified: trunk/dports/science/mpich/Portfile
===================================================================
--- trunk/dports/science/mpich/Portfile 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/Portfile 2013-10-19 03:21:13 UTC (rev 112333)
@@ -141,6 +141,11 @@
"\\n\\nTHIS SUBPORT WRAPS MACPORTS' DEFAULT COMPILER FOR C/C++"
}
+ post-extract {
+ reinplace "s|hydra-pmi-proxy|hydra-pmi-proxy-${cname}|" \
+ src/pm/hydra/pm/pmiserv/pmiserv_utils.c
+ }
+
configure.args-append \
--libdir=${prefix}/lib/${name}-${cname} \
--sysconfdir=${prefix}/etc/${name}-${cname} \
@@ -164,13 +169,20 @@
${destroot}${prefix}/lib/mpich-${cname}/pkgconfig/openpa.pc \
${destroot}${prefix}/lib/pkgconfig/
}
+
+ if {![variant_isset gforker]} {
+ system -W ${destroot}${prefix}/bin \
+ "ln -s mpiexec.hydra-${cname} mpiexec-${cname}"
+ }
}
if { [string first gcc $cname] == 0 } {
configure.args-delete --disable-f77 --disable-fc
configure.args-append --enable-f77 --enable-fc
select.file ${filespath}/mpich-${cname}-fortran
- variant fortran description {Stub : fortran always enabled for gcc-based version} {}
+ variant fortran description {
+ Stub : fortran always enabled for gcc-based version
+ } {}
default_variants-append +fortran
} else {
set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
@@ -249,12 +261,15 @@
}
notes "
-MPICH usage note:\
-The mpi\[cc|cxx|f77|f90\] wrappers are installed as\
-mpi\[cc|cxx|f77|f90\]-${cname}. To make ${subport} the default (i.e. the\
-version you get when you run 'mpicc/mpicxx'), please run:
-sudo port select --set mpich [file tail ${select.file}]
++--- MPICH Usage note ----
+| The mpi\[cc|cxx|f77|f90\] weappers are installed as
+| mpi\[cc|cxx|f77|f90\]-${cname}. To make ${subport} the default (i.e. the
+| version you get when you run 'mpicc/mpicxx'), please run:
+|
+| sudo port select --set mpich [file tail ${select.file}]
++-------------------------
+
"
variant gforker description {
Modified: trunk/dports/science/mpich/files/mpich-clang
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang
-bin/hydra_persist-clang
-bin/hydra_pmi_proxy-clang
bin/mpicc-clang
bin/mpichversion-clang
bin/mpicxx-clang
-bin/mpiexec.hydra-clang
-bin/mpiexec.hydra-clang
+bin/mpiexec-clang
-
-
bin/parkill-clang
Modified: trunk/dports/science/mpich/files/mpich-clang-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang
-bin/hydra_persist-clang
-bin/hydra_pmi_proxy-clang
bin/mpicc-clang
bin/mpichversion-clang
bin/mpicxx-clang
-bin/mpiexec.hydra-clang
-bin/mpiexec.hydra-clang
+bin/mpiexec-clang
bin/mpif77-clang
bin/mpif90-clang
bin/parkill-clang
Modified: trunk/dports/science/mpich/files/mpich-clang31
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang31 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang31 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang31
-bin/hydra_persist-clang31
-bin/hydra_pmi_proxy-clang31
bin/mpicc-clang31
bin/mpichversion-clang31
bin/mpicxx-clang31
-bin/mpiexec.hydra-clang31
-bin/mpiexec.hydra-clang31
+bin/mpiexec-clang31
-
-
bin/parkill-clang31
Modified: trunk/dports/science/mpich/files/mpich-clang31-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang31-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang31-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang31
-bin/hydra_persist-clang31
-bin/hydra_pmi_proxy-clang31
bin/mpicc-clang31
bin/mpichversion-clang31
bin/mpicxx-clang31
-bin/mpiexec.hydra-clang31
-bin/mpiexec.hydra-clang31
+bin/mpiexec-clang31
bin/mpif77-clang31
bin/mpif90-clang31
bin/parkill-clang31
Modified: trunk/dports/science/mpich/files/mpich-clang32
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang32 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang32 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang32
-bin/hydra_persist-clang32
-bin/hydra_pmi_proxy-clang32
bin/mpicc-clang32
bin/mpichversion-clang32
bin/mpicxx-clang32
-bin/mpiexec.hydra-clang32
-bin/mpiexec.hydra-clang32
+bin/mpiexec-clang32
-
-
bin/parkill-clang32
Modified: trunk/dports/science/mpich/files/mpich-clang32-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang32-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang32-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang32
-bin/hydra_persist-clang32
-bin/hydra_pmi_proxy-clang32
bin/mpicc-clang32
bin/mpichversion-clang32
bin/mpicxx-clang32
-bin/mpiexec.hydra-clang32
-bin/mpiexec.hydra-clang32
+bin/mpiexec-clang32
bin/mpif77-clang32
bin/mpif90-clang32
bin/parkill-clang32
Modified: trunk/dports/science/mpich/files/mpich-clang33
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang33 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang33 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang33
-bin/hydra_persist-clang33
-bin/hydra_pmi_proxy-clang33
bin/mpicc-clang33
bin/mpichversion-clang33
bin/mpicxx-clang33
-bin/mpiexec.hydra-clang33
-bin/mpiexec.hydra-clang33
+bin/mpiexec-clang33
-
-
bin/parkill-clang33
Modified: trunk/dports/science/mpich/files/mpich-clang33-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang33-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang33-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang33
-bin/hydra_persist-clang33
-bin/hydra_pmi_proxy-clang33
bin/mpicc-clang33
bin/mpichversion-clang33
bin/mpicxx-clang33
-bin/mpiexec.hydra-clang33
-bin/mpiexec.hydra-clang33
+bin/mpiexec-clang33
bin/mpif77-clang33
bin/mpif90-clang33
bin/parkill-clang33
Modified: trunk/dports/science/mpich/files/mpich-clang34
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang34 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang34 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang34
-bin/hydra_persist-clang34
-bin/hydra_pmi_proxy-clang34
bin/mpicc-clang34
bin/mpichversion-clang34
bin/mpicxx-clang34
-bin/mpiexec.hydra-clang34
-bin/mpiexec.hydra-clang34
+bin/mpiexec-clang34
-
-
bin/parkill-clang34
Modified: trunk/dports/science/mpich/files/mpich-clang34-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-clang34-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-clang34-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang34
-bin/hydra_persist-clang34
-bin/hydra_pmi_proxy-clang34
bin/mpicc-clang34
bin/mpichversion-clang34
bin/mpicxx-clang34
-bin/mpiexec.hydra-clang34
-bin/mpiexec.hydra-clang34
+bin/mpiexec-clang34
bin/mpif77-clang34
bin/mpif90-clang34
bin/parkill-clang34
Modified: trunk/dports/science/mpich/files/mpich-gcc43-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc43-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-gcc43-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc43
-bin/hydra_persist-gcc43
-bin/hydra_pmi_proxy-gcc43
bin/mpicc-gcc43
bin/mpichversion-gcc43
bin/mpicxx-gcc43
-bin/mpiexec.hydra-gcc43
-bin/mpiexec.hydra-gcc43
+bin/mpiexec-gcc43
bin/mpif77-gcc43
bin/mpif90-gcc43
bin/parkill-gcc43
Modified: trunk/dports/science/mpich/files/mpich-gcc44-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc44-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-gcc44-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc44
-bin/hydra_persist-gcc44
-bin/hydra_pmi_proxy-gcc44
bin/mpicc-gcc44
bin/mpichversion-gcc44
bin/mpicxx-gcc44
-bin/mpiexec.hydra-gcc44
-bin/mpiexec.hydra-gcc44
+bin/mpiexec-gcc44
bin/mpif77-gcc44
bin/mpif90-gcc44
bin/parkill-gcc44
Modified: trunk/dports/science/mpich/files/mpich-gcc45-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc45-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-gcc45-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc45
-bin/hydra_persist-gcc45
-bin/hydra_pmi_proxy-gcc45
bin/mpicc-gcc45
bin/mpichversion-gcc45
bin/mpicxx-gcc45
-bin/mpiexec.hydra-gcc45
-bin/mpiexec.hydra-gcc45
+bin/mpiexec-gcc45
bin/mpif77-gcc45
bin/mpif90-gcc45
bin/parkill-gcc45
Modified: trunk/dports/science/mpich/files/mpich-gcc46-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc46-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-gcc46-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc46
-bin/hydra_persist-gcc46
-bin/hydra_pmi_proxy-gcc46
bin/mpicc-gcc46
bin/mpichversion-gcc46
bin/mpicxx-gcc46
-bin/mpiexec.hydra-gcc46
-bin/mpiexec.hydra-gcc46
+bin/mpiexec-gcc46
bin/mpif77-gcc46
bin/mpif90-gcc46
bin/parkill-gcc46
Modified: trunk/dports/science/mpich/files/mpich-gcc47-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc47-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-gcc47-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc47
-bin/hydra_persist-gcc47
-bin/hydra_pmi_proxy-gcc47
bin/mpicc-gcc47
bin/mpichversion-gcc47
bin/mpicxx-gcc47
-bin/mpiexec.hydra-gcc47
-bin/mpiexec.hydra-gcc47
+bin/mpiexec-gcc47
bin/mpif77-gcc47
bin/mpif90-gcc47
bin/parkill-gcc47
Modified: trunk/dports/science/mpich/files/mpich-gcc48-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc48-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-gcc48-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc48
-bin/hydra_persist-gcc48
-bin/hydra_pmi_proxy-gcc48
bin/mpicc-gcc48
bin/mpichversion-gcc48
bin/mpicxx-gcc48
-bin/mpiexec.hydra-gcc48
-bin/mpiexec.hydra-gcc48
+bin/mpiexec-gcc48
bin/mpif77-gcc48
bin/mpif90-gcc48
bin/parkill-gcc48
Modified: trunk/dports/science/mpich/files/mpich-gcc49-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-gcc49-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-gcc49-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc49
-bin/hydra_persist-gcc49
-bin/hydra_pmi_proxy-gcc49
bin/mpicc-gcc49
bin/mpichversion-gcc49
bin/mpicxx-gcc49
-bin/mpiexec.hydra-gcc49
-bin/mpiexec.hydra-gcc49
+bin/mpiexec-gcc49
bin/mpif77-gcc49
bin/mpif90-gcc49
bin/parkill-gcc49
Modified: trunk/dports/science/mpich/files/mpich-llvm
===================================================================
--- trunk/dports/science/mpich/files/mpich-llvm 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-llvm 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-llvm
-bin/hydra_persist-llvm
-bin/hydra_pmi_proxy-llvm
bin/mpicc-llvm
bin/mpichversion-llvm
bin/mpicxx-llvm
-bin/mpiexec.hydra-llvm
-bin/mpiexec.hydra-llvm
+bin/mpiexec-llvm
-
-
bin/parkill-llvm
Modified: trunk/dports/science/mpich/files/mpich-llvm-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-llvm-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-llvm-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-llvm
-bin/hydra_persist-llvm
-bin/hydra_pmi_proxy-llvm
bin/mpicc-llvm
bin/mpichversion-llvm
bin/mpicxx-llvm
-bin/mpiexec.hydra-llvm
-bin/mpiexec.hydra-llvm
+bin/mpiexec-llvm
bin/mpif77-llvm
bin/mpif90-llvm
bin/parkill-llvm
Modified: trunk/dports/science/mpich/files/mpich-mp
===================================================================
--- trunk/dports/science/mpich/files/mpich-mp 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-mp 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-mp
-bin/hydra_persist-mp
-bin/hydra_pmi_proxy-mp
bin/mpicc-mp
bin/mpichversion-mp
bin/mpicxx-mp
-bin/mpiexec.hydra-mp
-bin/mpiexec.hydra-mp
+bin/mpiexec-mp
-
-
bin/parkill-mp
Modified: trunk/dports/science/mpich/files/mpich-mp-fortran
===================================================================
--- trunk/dports/science/mpich/files/mpich-mp-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich/files/mpich-mp-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-mp
-bin/hydra_persist-mp
-bin/hydra_pmi_proxy-mp
bin/mpicc-mp
bin/mpichversion-mp
bin/mpicxx-mp
-bin/mpiexec.hydra-mp
-bin/mpiexec.hydra-mp
+bin/mpiexec-mp
bin/mpif77-mp
bin/mpif90-mp
bin/parkill-mp
Modified: trunk/dports/science/mpich-devel/Portfile
===================================================================
--- trunk/dports/science/mpich-devel/Portfile 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/Portfile 2013-10-19 03:21:13 UTC (rev 112333)
@@ -15,7 +15,7 @@
name mpich-devel
version 3.1b1
distname mpich-${version}
-revision 3
+revision 5
license BSD
categories science parallel net
@@ -142,6 +142,11 @@
"\\n\\nTHIS SUBPORT WRAPS MACPORTS' DEFAULT COMPILER FOR C/C++"
}
+ post-extract {
+ reinplace "s|hydra-pmi-proxy|hydra-pmi-proxy-${cname}|" \
+ src/pm/hydra/pm/pmiserv/pmiserv_utils.c
+ }
+
configure.args-append \
--libdir=${prefix}/lib/${name}-${cname} \
--sysconfdir=${prefix}/etc/${name}-${cname} \
@@ -165,13 +170,20 @@
${destroot}${prefix}/lib/mpich-devel-${cname}/pkgconfig/openpa.pc \
${destroot}${prefix}/lib/pkgconfig/
}
+
+ if {![variant_isset gforker]} {
+ system -W ${destroot}${prefix}/bin \
+ "ln -s mpiexec.hydra-${cname} mpiexec-${cname}"
+ }
}
if { [string first gcc $cname] == 0 } {
configure.args-delete --disable-f77 --disable-fc
configure.args-append --enable-f77 --enable-fc
select.file ${filespath}/mpich-${cname}-fortran
- variant fortran description {Stub : fortran always enabled for gcc-based version} {}
+ variant fortran description {
+ Stub : fortran always enabled for gcc-based version
+ } {}
default_variants-append +fortran
} else {
set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
@@ -271,7 +283,7 @@
variant tuned description {Build with more optimizations} {
configure.args-delete --enable-fast=O2
configure.args-append --enable-fast=all \
- MPICHLIB_CFLAGS='-fomit-frame-pointer -O2'
+ MPICHLIB_CFLAGS='-fomit-frame-pointer -O2 -march=native'
}
livecheck.type regex
Modified: trunk/dports/science/mpich-devel/files/mpich-clang
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang
-bin/hydra_persist-clang
-bin/hydra_pmi_proxy-clang
bin/mpicc-clang
bin/mpichversion-clang
bin/mpicxx-clang
-bin/mpiexec.hydra-clang
-bin/mpiexec.hydra-clang
+bin/mpiexec-clang
-
-
bin/parkill-clang
Modified: trunk/dports/science/mpich-devel/files/mpich-clang-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang
-bin/hydra_persist-clang
-bin/hydra_pmi_proxy-clang
bin/mpicc-clang
bin/mpichversion-clang
bin/mpicxx-clang
-bin/mpiexec.hydra-clang
-bin/mpiexec.hydra-clang
+bin/mpiexec-clang
bin/mpif77-clang
bin/mpif90-clang
bin/parkill-clang
Modified: trunk/dports/science/mpich-devel/files/mpich-clang31
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang31 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang31 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang31
-bin/hydra_persist-clang31
-bin/hydra_pmi_proxy-clang31
bin/mpicc-clang31
bin/mpichversion-clang31
bin/mpicxx-clang31
-bin/mpiexec.hydra-clang31
-bin/mpiexec.hydra-clang31
+bin/mpiexec-clang31
-
-
bin/parkill-clang31
Modified: trunk/dports/science/mpich-devel/files/mpich-clang31-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang31-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang31-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang31
-bin/hydra_persist-clang31
-bin/hydra_pmi_proxy-clang31
bin/mpicc-clang31
bin/mpichversion-clang31
bin/mpicxx-clang31
-bin/mpiexec.hydra-clang31
-bin/mpiexec.hydra-clang31
+bin/mpiexec-clang31
bin/mpif77-clang31
bin/mpif90-clang31
bin/parkill-clang31
Modified: trunk/dports/science/mpich-devel/files/mpich-clang32
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang32 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang32 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang32
-bin/hydra_persist-clang32
-bin/hydra_pmi_proxy-clang32
bin/mpicc-clang32
bin/mpichversion-clang32
bin/mpicxx-clang32
-bin/mpiexec.hydra-clang32
-bin/mpiexec.hydra-clang32
+bin/mpiexec-clang32
-
-
bin/parkill-clang32
Modified: trunk/dports/science/mpich-devel/files/mpich-clang32-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang32-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang32-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang32
-bin/hydra_persist-clang32
-bin/hydra_pmi_proxy-clang32
bin/mpicc-clang32
bin/mpichversion-clang32
bin/mpicxx-clang32
-bin/mpiexec.hydra-clang32
-bin/mpiexec.hydra-clang32
+bin/mpiexec-clang32
bin/mpif77-clang32
bin/mpif90-clang32
bin/parkill-clang32
Modified: trunk/dports/science/mpich-devel/files/mpich-clang33
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang33 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang33 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang33
-bin/hydra_persist-clang33
-bin/hydra_pmi_proxy-clang33
bin/mpicc-clang33
bin/mpichversion-clang33
bin/mpicxx-clang33
-bin/mpiexec.hydra-clang33
-bin/mpiexec.hydra-clang33
+bin/mpiexec-clang33
-
-
bin/parkill-clang33
Modified: trunk/dports/science/mpich-devel/files/mpich-clang33-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang33-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang33-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang33
-bin/hydra_persist-clang33
-bin/hydra_pmi_proxy-clang33
bin/mpicc-clang33
bin/mpichversion-clang33
bin/mpicxx-clang33
-bin/mpiexec.hydra-clang33
-bin/mpiexec.hydra-clang33
+bin/mpiexec-clang33
bin/mpif77-clang33
bin/mpif90-clang33
bin/parkill-clang33
Modified: trunk/dports/science/mpich-devel/files/mpich-clang34
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang34 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang34 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang34
-bin/hydra_persist-clang34
-bin/hydra_pmi_proxy-clang34
bin/mpicc-clang34
bin/mpichversion-clang34
bin/mpicxx-clang34
-bin/mpiexec.hydra-clang34
-bin/mpiexec.hydra-clang34
+bin/mpiexec-clang34
-
-
bin/parkill-clang34
Modified: trunk/dports/science/mpich-devel/files/mpich-clang34-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-clang34-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-clang34-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-clang34
-bin/hydra_persist-clang34
-bin/hydra_pmi_proxy-clang34
bin/mpicc-clang34
bin/mpichversion-clang34
bin/mpicxx-clang34
-bin/mpiexec.hydra-clang34
-bin/mpiexec.hydra-clang34
+bin/mpiexec-clang34
bin/mpif77-clang34
bin/mpif90-clang34
bin/parkill-clang34
Modified: trunk/dports/science/mpich-devel/files/mpich-gcc43-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc43-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc43-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc43
-bin/hydra_persist-gcc43
-bin/hydra_pmi_proxy-gcc43
bin/mpicc-gcc43
bin/mpichversion-gcc43
bin/mpicxx-gcc43
-bin/mpiexec.hydra-gcc43
-bin/mpiexec.hydra-gcc43
+bin/mpiexec-gcc43
bin/mpif77-gcc43
bin/mpif90-gcc43
bin/parkill-gcc43
Modified: trunk/dports/science/mpich-devel/files/mpich-gcc44-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc44-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc44-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc44
-bin/hydra_persist-gcc44
-bin/hydra_pmi_proxy-gcc44
bin/mpicc-gcc44
bin/mpichversion-gcc44
bin/mpicxx-gcc44
-bin/mpiexec.hydra-gcc44
-bin/mpiexec.hydra-gcc44
+bin/mpiexec-gcc44
bin/mpif77-gcc44
bin/mpif90-gcc44
bin/parkill-gcc44
Modified: trunk/dports/science/mpich-devel/files/mpich-gcc45-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc45-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc45-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc45
-bin/hydra_persist-gcc45
-bin/hydra_pmi_proxy-gcc45
bin/mpicc-gcc45
bin/mpichversion-gcc45
bin/mpicxx-gcc45
-bin/mpiexec.hydra-gcc45
-bin/mpiexec.hydra-gcc45
+bin/mpiexec-gcc45
bin/mpif77-gcc45
bin/mpif90-gcc45
bin/parkill-gcc45
Modified: trunk/dports/science/mpich-devel/files/mpich-gcc46-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc46-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc46-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc46
-bin/hydra_persist-gcc46
-bin/hydra_pmi_proxy-gcc46
bin/mpicc-gcc46
bin/mpichversion-gcc46
bin/mpicxx-gcc46
-bin/mpiexec.hydra-gcc46
-bin/mpiexec.hydra-gcc46
+bin/mpiexec-gcc46
bin/mpif77-gcc46
bin/mpif90-gcc46
bin/parkill-gcc46
Modified: trunk/dports/science/mpich-devel/files/mpich-gcc47-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc47-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc47-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc47
-bin/hydra_persist-gcc47
-bin/hydra_pmi_proxy-gcc47
bin/mpicc-gcc47
bin/mpichversion-gcc47
bin/mpicxx-gcc47
-bin/mpiexec.hydra-gcc47
-bin/mpiexec.hydra-gcc47
+bin/mpiexec-gcc47
bin/mpif77-gcc47
bin/mpif90-gcc47
bin/parkill-gcc47
Modified: trunk/dports/science/mpich-devel/files/mpich-gcc48-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc48-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc48-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc48
-bin/hydra_persist-gcc48
-bin/hydra_pmi_proxy-gcc48
bin/mpicc-gcc48
bin/mpichversion-gcc48
bin/mpicxx-gcc48
-bin/mpiexec.hydra-gcc48
-bin/mpiexec.hydra-gcc48
+bin/mpiexec-gcc48
bin/mpif77-gcc48
bin/mpif90-gcc48
bin/parkill-gcc48
Modified: trunk/dports/science/mpich-devel/files/mpich-gcc49-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-gcc49-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-gcc49-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-gcc49
-bin/hydra_persist-gcc49
-bin/hydra_pmi_proxy-gcc49
bin/mpicc-gcc49
bin/mpichversion-gcc49
bin/mpicxx-gcc49
-bin/mpiexec.hydra-gcc49
-bin/mpiexec.hydra-gcc49
+bin/mpiexec-gcc49
bin/mpif77-gcc49
bin/mpif90-gcc49
bin/parkill-gcc49
Modified: trunk/dports/science/mpich-devel/files/mpich-llvm
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-llvm 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-llvm 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-llvm
-bin/hydra_persist-llvm
-bin/hydra_pmi_proxy-llvm
bin/mpicc-llvm
bin/mpichversion-llvm
bin/mpicxx-llvm
-bin/mpiexec.hydra-llvm
-bin/mpiexec.hydra-llvm
+bin/mpiexec-llvm
-
-
bin/parkill-llvm
Modified: trunk/dports/science/mpich-devel/files/mpich-llvm-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-llvm-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-llvm-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-llvm
-bin/hydra_persist-llvm
-bin/hydra_pmi_proxy-llvm
bin/mpicc-llvm
bin/mpichversion-llvm
bin/mpicxx-llvm
-bin/mpiexec.hydra-llvm
-bin/mpiexec.hydra-llvm
+bin/mpiexec-llvm
bin/mpif77-llvm
bin/mpif90-llvm
bin/parkill-llvm
Modified: trunk/dports/science/mpich-devel/files/mpich-mp
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-mp 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-mp 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-mp
-bin/hydra_persist-mp
-bin/hydra_pmi_proxy-mp
bin/mpicc-mp
bin/mpichversion-mp
bin/mpicxx-mp
-bin/mpiexec.hydra-mp
-bin/mpiexec.hydra-mp
+bin/mpiexec-mp
-
-
bin/parkill-mp
Modified: trunk/dports/science/mpich-devel/files/mpich-mp-fortran
===================================================================
--- trunk/dports/science/mpich-devel/files/mpich-mp-fortran 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/mpich-devel/files/mpich-mp-fortran 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,11 +1,7 @@
-bin/hydra_nameserver-mp
-bin/hydra_persist-mp
-bin/hydra_pmi_proxy-mp
bin/mpicc-mp
bin/mpichversion-mp
bin/mpicxx-mp
-bin/mpiexec.hydra-mp
-bin/mpiexec.hydra-mp
+bin/mpiexec-mp
bin/mpif77-mp
bin/mpif90-mp
bin/parkill-mp
Modified: trunk/dports/science/octopus/Portfile
===================================================================
--- trunk/dports/science/octopus/Portfile 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/science/octopus/Portfile 2013-10-19 03:21:13 UTC (rev 112333)
@@ -143,7 +143,7 @@
configure.fc mpif90-mp
configure.args-delete --disable-mpi
configure.args-append --enable-mpi --without-external_zoltan
- test.env-append MPIEXEC=${prefix}/bin/mpiexec.hydra-mp
+ test.env-append MPIEXEC=${prefix}/bin/mpiexec-mp
depends_lib-append path:bin/mpif90-mp:mpich-default
}
Modified: trunk/dports/sysutils/mpich_select/Portfile
===================================================================
--- trunk/dports/sysutils/mpich_select/Portfile 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/sysutils/mpich_select/Portfile 2013-10-19 03:21:13 UTC (rev 112333)
@@ -5,6 +5,7 @@
name mpich_select
version 0.0
+revision 1
categories sysutils
platforms darwin
license BSD
Modified: trunk/dports/sysutils/mpich_select/files/base
===================================================================
--- trunk/dports/sysutils/mpich_select/files/base 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/sysutils/mpich_select/files/base 2013-10-19 03:21:13 UTC (rev 112333)
@@ -1,10 +1,6 @@
-bin/hydra_nameserver
-bin/hydra_persist
-bin/hydra_pmi_proxy
bin/mpicc
bin/mpichversion
bin/mpicxx
-bin/mpiexec.hydra
bin/mpiexec
bin/mpif77
bin/mpif90
Modified: trunk/dports/sysutils/mpich_select/files/none
===================================================================
--- trunk/dports/sysutils/mpich_select/files/none 2013-10-18 23:59:48 UTC (rev 112332)
+++ trunk/dports/sysutils/mpich_select/files/none 2013-10-19 03:21:13 UTC (rev 112333)
@@ -5,7 +5,3 @@
-
-
-
--
--
--
--
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131018/9deafd58/attachment-0001.html>
More information about the macports-changes
mailing list