[111272] trunk/dports
eborisch at macports.org
eborisch at macports.org
Tue Sep 17 20:35:58 PDT 2013
Revision: 111272
https://trac.macports.org/changeset/111272
Author: eborisch at macports.org
Date: 2013-09-17 20:35:57 -0700 (Tue, 17 Sep 2013)
Log Message:
-----------
Multiple ports: Updating ports with variants depending on mpich to depend on mpich[-devel]-default. NOT REVBUMPING as these do not depend on mpich by default. rev-upgrade should catch for users with variants selected.
Modified Paths:
--------------
trunk/dports/devel/valgrind/Portfile
trunk/dports/devel/valgrind-devel/Portfile
trunk/dports/graphics/vtk-devel/Portfile
trunk/dports/lang/omnixmp/Portfile
trunk/dports/math/arpack/Portfile
trunk/dports/math/fftw/Portfile
trunk/dports/math/fftw-3/Portfile
trunk/dports/math/fftw-single/Portfile
trunk/dports/math/gnudatalanguage/Portfile
trunk/dports/math/petsc/Portfile
trunk/dports/math/plda/Portfile
trunk/dports/python/py-mpi4py/Portfile
trunk/dports/science/hdf5/Portfile
trunk/dports/science/hdf5-18/Portfile
trunk/dports/science/hpl/Portfile
trunk/dports/science/nco/Portfile
trunk/dports/science/netcdf/Portfile
trunk/dports/science/netcdf-cxx/Portfile
trunk/dports/science/netcdf-cxx4/Portfile
trunk/dports/science/netcdf-fortran/Portfile
trunk/dports/science/octopus/Portfile
Modified: trunk/dports/devel/valgrind/Portfile
===================================================================
--- trunk/dports/devel/valgrind/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/devel/valgrind/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -72,9 +72,9 @@
variant mpich2 requires mpich description {Compatibility variant, renamed to +mpich} {}
variant mpich description {Use mpich for MPI support} conflicts universal {
- depends_lib-append path:bin/mpicc:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
configure.args-delete --without-mpicc
- configure.args-append --with-mpicc=${prefix}/bin/mpicc
+ configure.args-append --with-mpicc=${prefix}/bin/mpicc-mp
}
variant openmpi description {Use openmpi for MPI support} conflicts universal {
Modified: trunk/dports/devel/valgrind-devel/Portfile
===================================================================
--- trunk/dports/devel/valgrind-devel/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/devel/valgrind-devel/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -65,9 +65,9 @@
variant mpich2 requires mpich description {Compatibility variant, renamed to +mpich} {}
variant mpich description {Use mpich for MPI support} conflicts universal {
- depends_lib-append path:bin/mpicc:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
configure.args-delete --without-mpicc
- configure.args-append --with-mpicc=${prefix}/bin/mpicc
+ configure.args-append --with-mpicc=${prefix}/bin/mpicc-mp
}
variant openmpi description {Use openmpi for MPI support} conflicts universal {
Modified: trunk/dports/graphics/vtk-devel/Portfile
===================================================================
--- trunk/dports/graphics/vtk-devel/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/graphics/vtk-devel/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -757,14 +757,14 @@
# --- Miscellaneous variants
-variant mpi description "use message passing interface (mpich2) for parallel support" {
+variant mpi description "use message passing interface (mpich) for parallel support" {
set nCPU [expr [exec sysctl -n hw.logicalcpu_max]]
depends_lib-append \
- path:bin/mpicc:mpich
+ path:bin/mpicxx-mp:mpich-default
configure.args-append \
-DVTK_USE_MPI:BOOL=ON \
- -DMPI_COMPILER:FILEPATH=${prefix}/bin/mpicxx \
- -DMPIEXEC:FILEPATH=${prefix}/bin/mpiexec \
+ -DMPI_COMPILER:FILEPATH=${prefix}/bin/mpicxx-mp \
+ -DMPIEXEC:FILEPATH=${prefix}/bin/mpiexec.hydra-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/lang/omnixmp/Portfile
===================================================================
--- trunk/dports/lang/omnixmp/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/lang/omnixmp/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -86,9 +86,9 @@
variant mpich2 requires mpich description {Variant remaned as +mpich} {}
variant mpich conflicts openmpi description {build with MPICH} {
- depends_lib-append port:mpich
- configure.args-append --with-mpicc=${prefix}/bin/mpicc
- configure.args-append --with-mpif90=${prefix}/bin/mpif90
+ depends_lib-append path:bin/mpicc-mp:mpich-default
+ configure.args-append --with-mpicc=${prefix}/bin/mpicc-mp
+ configure.args-append --with-mpif90=${prefix}/bin/mpif90-mp
}
notes \
Modified: trunk/dports/math/arpack/Portfile
===================================================================
--- trunk/dports/math/arpack/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/math/arpack/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -61,10 +61,10 @@
}
variant mpich description {build PARPACK, with MPICH} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 g95 openmpi {
- depends_lib-append path:bin/mpif77:mpich
+ depends_lib-append path:bin/mpif77-mp:mpich-default
configure.args-delete --disable-mpi
configure.args-append --enable-mpi
- configure.env-append F77=${prefix}/bin/mpif77 MPIF77=${prefix}/bin/mpif77
+ configure.env-append F77=${prefix}/bin/mpif77-mp MPIF77=${prefix}/bin/mpif77-mp
}
variant gcc43 description {build with gfortran-mp-4.3} conflicts gcc44 gcc45 gcc46 gcc47 gcc48 g95 universal openmpi mpich {
Modified: trunk/dports/math/fftw/Portfile
===================================================================
--- trunk/dports/math/fftw/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/math/fftw/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -46,8 +46,12 @@
}
variant mpi description {Include FFTW MPI library} {
- depends_lib-append path:bin/mpicc:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
configure.args-append --enable-mpi
+
+ post-extract {
+ reinplace "s/mpicc/mpicc-mp mpicc/" configure
+ }
}
set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/math/fftw-3/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -245,8 +245,8 @@
}
variant mpich description {compile FFTW MPI library with MPICH} conflicts openmpi {
- depends_lib-append path:bin/mpicc:mpich
- configure.env MPICC=${prefix}/bin/mpicc
+ depends_lib-append path:bin/mpicc-mp:mpich-default
+ configure.env MPICC=${prefix}/bin/mpicc-mp
configure.args-append --enable-mpi
}
Modified: trunk/dports/math/fftw-single/Portfile
===================================================================
--- trunk/dports/math/fftw-single/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/math/fftw-single/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -50,8 +50,12 @@
}
variant mpi description {Include FFTW MPI library} {
- depends_lib-append path:bin/mpicc:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
configure.args-append --enable-mpi
+
+ post-extract {
+ reinplace "s/mpicc/mpicc-mp mpicc/" configure
+ }
}
# Documentation conflicts with the double precision version,
Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/math/gnudatalanguage/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -123,10 +123,11 @@
}
variant mpich description {build with support for MPICH (experimental)} {
- depends_lib-append port:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
configure.args-delete -DMPICH=OFF
- configure.args-append -DMPICH=ON \
- -DMPICHDIR=${prefix}/lib/mpich
+ configure.args-append -DMPICH=ON
+ configure.args-append -DMPI_COMPILER=${prefix}/bin/mpicc-mp \
+ -DMPI_LIBRARY=MPI_LIBRARY-NOTFOUND
}
# gnudatalanguage does not build against wxWidgets30.
Modified: trunk/dports/math/petsc/Portfile
===================================================================
--- trunk/dports/math/petsc/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/math/petsc/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -74,12 +74,12 @@
}
variant mpich description {Build using the MPICH compiler} conflicts openmpi {
- depends_lib-append path:bin/mpicc:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
configure.args-append \
- --with-cc=${prefix}/bin/mpicc \
- --with-cxx=${prefix}/bin/mpicxx \
- --with-fc=${prefix}/bin/mpif90 \
- --with-mpiexec=${prefix}/bin/mpiexec
+ --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
}
variant accelerate description {Use Accelerate framework for LAPACK} conflicts atlas {
Modified: trunk/dports/math/plda/Portfile
===================================================================
--- trunk/dports/math/plda/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/math/plda/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -33,8 +33,11 @@
CFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]"
variant mpi description {Add parallel lda} {
- depends_lib path:bin/mpicc:mpich
+ depends_lib path:bin/mpicc-mp:mpich-default
build.target lda infer mpi_lda
+ post-extract {
+ reinplace "s/mpicxx/mpicxx-mp -Wno-type-safety/" Makefile
+ }
post-destroot {
xinstall -m 755 ${worksrcpath}/mpi_lda ${destroot}${prefix}/bin/mpi_plda
}
Modified: trunk/dports/python/py-mpi4py/Portfile
===================================================================
--- trunk/dports/python/py-mpi4py/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/python/py-mpi4py/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -44,8 +44,9 @@
variant mpich description {builds with the mpich port} {
build.args-delete "--mpicc=${prefix}/bin/openmpicc"
+ build.args-append "--mpicc=${prefix}/bin/mpicc-mp"
depends_lib-delete port:openmpi
- depends_lib-append path:bin/mpicc:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
}
variant mpich2 requires mpich description {Legacy compatibility variant} {}
Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/hdf5/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -116,11 +116,11 @@
}
variant mpich description {Parallel HDF5 with mpich (disables C++)} {
- depends_lib-append path:bin/mpicc:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
configure.args-delete --enable-cxx
- configure.cc ${prefix}/bin/mpicc
+ configure.cc ${prefix}/bin/mpicc-mp
if { [variant_isset fortran] } {
- configure.fc ${prefix}/bin/mpif90
+ configure.fc ${prefix}/bin/mpif90-mp
}
}
Modified: trunk/dports/science/hdf5-18/Portfile
===================================================================
--- trunk/dports/science/hdf5-18/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/hdf5-18/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -170,10 +170,10 @@
Enable Parallel HDF5 with mpich. Uses compiler selected with mpich.
+mpich is EXPERIMENTAL with +cxx or +threadsafe.
} conflicts universal openmpi gcc44 gcc45 gcc46 gcc47 gcc48 {
- depends_lib-append path:bin/mpicc:mpich
- configure.cc ${prefix}/bin/mpicc
- configure.cxx ${prefix}/bin/mpicxx
- configure.fc ${prefix}/bin/mpif90
+ depends_lib-append path:bin/mpicc-mp:mpich-default
+ configure.cc ${prefix}/bin/mpicc-mp
+ configure.cxx ${prefix}/bin/mpicxx-mp
+ configure.fc ${prefix}/bin/mpif90-mp
}
if {[ variant_isset mpich ] || [ variant_isset openmpi ]} {
Modified: trunk/dports/science/hpl/Portfile
===================================================================
--- trunk/dports/science/hpl/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/hpl/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -63,10 +63,10 @@
}
variant mpich conflicts openmpi description {Build with MPICH} {
- depends_lib-append path:bin/mpicc:mpich
- build.args-append CC=${prefix}/bin/mpicc \
- LINKER=${prefix}/bin/mpicc
- test.cmd cd bin/macos && ${prefix}/bin/openmpirun -n 4 ./xhpl
+ 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
}
variant atlas conflicts accelerate description {Use ATLAS for BLAS library} {
Modified: trunk/dports/science/nco/Portfile
===================================================================
--- trunk/dports/science/nco/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/nco/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -72,8 +72,12 @@
}
variant mpich description {enable MPI with mpich} {
- depends_lib-append path:bin/mpicc:mpich
+ depends_lib-append path:bin/mpicc-mp:mpich-default
configure.args-append --enable-mpi
+ post-extract {
+ reinplace -E "s|( ?MPICC := ).*|\\1${prefix}/mpicc-mp|" bld/Makefile
+ reinplace -E "s|( ?MPICXX := ).*|\\1${prefix}/mpicxx-mp|" bld/Makefile
+ }
}
variant openmpi description {enable MPI with openmpi} {
Modified: trunk/dports/science/netcdf/Portfile
===================================================================
--- trunk/dports/science/netcdf/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/netcdf/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -63,8 +63,8 @@
}
variant mpich conflicts openmpi description {compile with mpich} {
- depends_lib-append path:bin/mpicc:mpich
- configure.cc mpicc
+ depends_lib-append path:bin/mpicc-mp:mpich-default
+ configure.cc mpicc-mp
configure.cc_archflags ""
configure.ld_archflags ""
}
Modified: trunk/dports/science/netcdf-cxx/Portfile
===================================================================
--- trunk/dports/science/netcdf-cxx/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/netcdf-cxx/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -57,9 +57,9 @@
}
variant mpich conflicts openmpi description {compile with mpich} {
- depends_lib-append path:bin/mpicc:mpich
- configure.cc mpicc
- configure.cxx mpicxx
+ depends_lib-append path:bin/mpicc-mp:mpich-default
+ configure.cc mpicc-mp
+ configure.cxx mpicxx-mp
}
variant mpich2 requires mpich description {Legacy compatibility variant} {}
Modified: trunk/dports/science/netcdf-cxx4/Portfile
===================================================================
--- trunk/dports/science/netcdf-cxx4/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/netcdf-cxx4/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -55,9 +55,9 @@
}
variant mpich conflicts openmpi description {compile with mpich} {
- depends_lib-append path:bin/mpicc:mpich
- configure.cc mpicc
- configure.cxx mpicxx
+ depends_lib-append path:bin/mpicc-mp:mpich-default
+ configure.cc mpicc-mp
+ configure.cxx mpicxx-mp
}
variant mpich2 requires mpich description {Legacy compatibility variant} {}
Modified: trunk/dports/science/netcdf-fortran/Portfile
===================================================================
--- trunk/dports/science/netcdf-fortran/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/netcdf-fortran/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -134,9 +134,9 @@
}
variant mpich conflicts openmpi description {compile with mpich} {
- depends_lib-append path:bin/mpicc:mpich
- configure.fc mpif90
- configure.cc mpicc
+ depends_lib-append path:bin/mpicc-mp:mpich-default
+ configure.fc mpif90-mp
+ configure.cc mpicc-mp
}
variant mpich2 requires mpich description {Legacy compatibility variant} {}
Modified: trunk/dports/science/octopus/Portfile
===================================================================
--- trunk/dports/science/octopus/Portfile 2013-09-18 03:06:42 UTC (rev 111271)
+++ trunk/dports/science/octopus/Portfile 2013-09-18 03:35:57 UTC (rev 111272)
@@ -51,10 +51,10 @@
} elseif { [variant_isset openmpi] } {
if { [active_variants openmpi ${fc_name}] } { set fortran ${fc_name} }
} elseif { [variant_isset mpich] } {
- if { [_portnameactive mpich] } {
- if { [active_variants mpich ${fc_name}] } { set fortran ${fc_name} }
- } elseif { [_portnameactive mpich-devel] } {
- if { [active_variants mpich-devel ${fc_name}] } { set fortran ${fc_name} }
+ if { [_portnameactive mpich-default] } {
+ if { [active_variants mpich-default ${fc_name}] } { set fortran ${fc_name} }
+ } elseif { [_portnameactive mpich-devel-default] } {
+ if { [active_variants mpich-devel-default ${fc_name}] } { set fortran ${fc_name} }
}
}
}
@@ -64,8 +64,8 @@
ui_error "Variant +openmpi requires openmpi to have been built with Fortran support."
return -code error "Variant +openmpi requires openmpi to have been built with Fortran support."
} elseif { [variant_isset mpich] } {
- ui_error "Variant +mpich requires mpich/mpich-devel to have been built with Fortran support."
- return -code error "Variant +mpich requires mpich/mpich-devel to have been built with Fortran support."
+ ui_error "Variant +mpich requires mpich-default/mpich-devel-default to have been built with Fortran support."
+ return -code error "Variant +mpich requires mpich-default/mpich-devel-default to have been built with Fortran support."
} else {
ui_error "Internal error: cannot determine Fortran compiler."
return -code error "Internal error: cannot determine Fortran compiler."
@@ -136,11 +136,12 @@
}
variant mpich conflicts gcc46 gcc47 gcc48 openmpi description {Build with MPICH} {
- configure.cc mpicc
- configure.fc mpif90
+ configure.cc mpicc-mp
+ configure.fc mpif90-mp
configure.args-delete --disable-mpi
configure.args-append --enable-mpi --without-external_zoltan
- depends_lib-append path:bin/mpif90:mpich
+ test.env-append MPIEXEC=${prefix}/bin/mpiexec.hydra-mp
+ depends_lib-append path:bin/mpif90-mp:mpich-default
}
variant newuoa description {Build with internal newuoa library for optimal control} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130917/1f8d68b7/attachment-0001.html>
More information about the macports-changes
mailing list