[130952] trunk/dports
sean at macports.org
sean at macports.org
Sat Jan 3 22:01:01 PST 2015
Revision: 130952
https://trac.macports.org/changeset/130952
Author: sean at macports.org
Date: 2015-01-03 22:01:01 -0800 (Sat, 03 Jan 2015)
Log Message:
-----------
mpi-1.0: set default variant in the portgroup
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/mpi-1.0.tcl
trunk/dports/devel/GASNet/Portfile
trunk/dports/lang/omnicompiler/Portfile
trunk/dports/math/dolfin/Portfile
trunk/dports/math/mumps/Portfile
trunk/dports/math/parmetis/Portfile
trunk/dports/math/scalapack/Portfile
trunk/dports/python/py-mpi4py/Portfile
trunk/dports/python/py-petsc4py/Portfile
trunk/dports/science/apbs/Portfile
trunk/dports/science/scotch/Portfile
trunk/dports/science/yaxt/Portfile
Modified: trunk/dports/_resources/port1.0/group/mpi-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/mpi-1.0.tcl 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/_resources/port1.0/group/mpi-1.0.tcl 2015-01-04 06:01:01 UTC (rev 130952)
@@ -280,6 +280,11 @@
require_active_variants $mpi $cv $cl
}
+
+ if {${mpi.require} && ![mpi_variant_isset]} {
+ default_variants-append +mpich
+ }
+
}
pre-fetch {
Modified: trunk/dports/devel/GASNet/Portfile
===================================================================
--- trunk/dports/devel/GASNet/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/devel/GASNet/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -31,9 +31,6 @@
universal_variant no
-if {![mpi_variant_isset]} {
- default_variants-append +mpich
-}
if {![gcc_variant_isset]} {
default_variants-append +gcc48
}
Modified: trunk/dports/lang/omnicompiler/Portfile
===================================================================
--- trunk/dports/lang/omnicompiler/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/lang/omnicompiler/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -56,9 +56,6 @@
use_parallel_build no
-if {![mpi_variant_isset]} {
- default_variants-append +mpich
-}
if {![gcc_variant_isset]} {
default_variants-append +gcc48
}
Modified: trunk/dports/math/dolfin/Portfile
===================================================================
--- trunk/dports/math/dolfin/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/math/dolfin/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -57,10 +57,6 @@
configure.dir ${worksrcpath}/build
build.dir ${worksrcpath}/build
-if {![mpi_variant_isset]} {
- default_variants +mpich
-}
-
post-patch {
file mkdir ${worksrcpath}/build
# delete the message telling users to source a bash file, which is unneeded
Modified: trunk/dports/math/mumps/Portfile
===================================================================
--- trunk/dports/math/mumps/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/math/mumps/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -43,10 +43,6 @@
configure.fflags -fPIC -O3 -mtune=native
configure.f90flags -fPIC -O3 -mtune=native
-if {![mpi_variant_isset]} {
- default_variants +mpich
-}
-
post-extract {
file copy ${worksrcpath}/Make.inc/Makefile.gfortran.PAR ${worksrcpath}/Makefile.inc
reinplace "s|^\#LMETISDIR.*$|LMETISDIR = ${prefix}/lib|" ${worksrcpath}/Makefile.inc
Modified: trunk/dports/math/parmetis/Portfile
===================================================================
--- trunk/dports/math/parmetis/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/math/parmetis/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -26,7 +26,7 @@
sha256 f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f
compilers.choose cc cxx
-mpi.setup
+mpi.setup require
depends_lib port:metis
@@ -47,10 +47,6 @@
configure.args-append \
-DSHARED=1
-if {![mpi_variant_isset]} {
- default_variants +mpich
-}
-
if {[variant_isset debug]} {
# just to be safe
configure.cflags-delete -O1 -O2 -O3 -Os -DNDEBUG
Modified: trunk/dports/math/scalapack/Portfile
===================================================================
--- trunk/dports/math/scalapack/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/math/scalapack/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -37,9 +37,5 @@
-DMPI_Fortran_COMPILER=${mpi.fc}
}
-if {![mpi_variant_isset]} {
- default_variants +mpich
-}
-
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
Modified: trunk/dports/python/py-mpi4py/Portfile
===================================================================
--- trunk/dports/python/py-mpi4py/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/python/py-mpi4py/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -31,10 +31,6 @@
python.versions 26 27 33 34
-if {![mpi_variant_isset]} {
- default_variants +mpich
-}
-
if {${name} ne ${subport}} {
depends_build-append \
port:py${python.version}-setuptools \
Modified: trunk/dports/python/py-petsc4py/Portfile
===================================================================
--- trunk/dports/python/py-petsc4py/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/python/py-petsc4py/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -31,10 +31,6 @@
build.env-append PETSC_DIR=${prefix}/lib/petsc
destroot.env-append PETSC_DIR=${prefix}/lib/petsc
-if {![mpi_variant_isset]} {
- default_variants +mpich
-}
-
if {${subport} ne ${name}} {
mpi.enforce_variant \
py${python.version}-mpi4py
Modified: trunk/dports/science/apbs/Portfile
===================================================================
--- trunk/dports/science/apbs/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/science/apbs/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -75,10 +75,6 @@
compilers.enforce_c apbs
- if {![mpi_variant_isset]} {
- default_variants +mpich
- }
-
pre-configure {
configure.cc ${mpi.cc}
configure.cxx ${mpi.cxx}
Modified: trunk/dports/science/scotch/Portfile
===================================================================
--- trunk/dports/science/scotch/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/science/scotch/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -47,10 +47,6 @@
use_configure no
-if {![mpi_variant_isset]} {
- default_variants +mpich
-}
-
post-extract {
copy ${worksrcpath}/Make.inc/Makefile.inc.i686_mac_darwin8 ${worksrcpath}/Makefile.inc
reinplace "s|-O3|-O3 -fPIC|" ${worksrcpath}/Makefile.inc
Modified: trunk/dports/science/yaxt/Portfile
===================================================================
--- trunk/dports/science/yaxt/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
+++ trunk/dports/science/yaxt/Portfile 2015-01-04 06:01:01 UTC (rev 130952)
@@ -28,10 +28,6 @@
configure.cppflags-append -I../src
configure.fcflags-append -cpp
-if {![mpi_variant_isset]} {
- default_variants +mpich
-}
-
livecheck.type regex
livecheck.url ${homepage}/wiki/Downloads
livecheck.regex {([0-9]+\.[0-9]+\.[0-9]+)}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150103/019dc4cf/attachment.html>
More information about the macports-changes
mailing list