[129985] trunk/dports
sean at macports.org
sean at macports.org
Tue Dec 23 16:42:39 PST 2014
Revision: 129985
https://trac.macports.org/changeset/129985
Author: sean at macports.org
Date: 2014-12-23 16:42:39 -0800 (Tue, 23 Dec 2014)
Log Message:
-----------
mpi-1.0: remove mpi.choose
This variable never worked correctly and caused mpi ports to wrongly list
fortran variants when only a c/cxx compiler was needed. So, we use
compilers.choose now.
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/mpi-1.0.tcl
trunk/dports/devel/GASNet/Portfile
trunk/dports/devel/valgrind/Portfile
trunk/dports/lang/berkeley_upc/Portfile
trunk/dports/lang/omnicompiler/Portfile
trunk/dports/math/fftw/Portfile
trunk/dports/math/fftw-3/Portfile
trunk/dports/math/gnudatalanguage/Portfile
trunk/dports/math/optpp/Portfile
trunk/dports/math/plda/Portfile
trunk/dports/python/py-scientific/Portfile
trunk/dports/science/apbs/Portfile
trunk/dports/science/cdo/Portfile
trunk/dports/science/hdfeos5/Portfile
Modified: trunk/dports/_resources/port1.0/group/mpi-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/mpi-1.0.tcl 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/_resources/port1.0/group/mpi-1.0.tcl 2014-12-24 00:42:39 UTC (rev 129985)
@@ -42,7 +42,6 @@
default mpi.require 0
default mpi.required_variants {}
-set mpi.list {cc cxx f77 f90 fc}
set mpi.cc mpicc
set mpi.cxx mpicxx
set mpi.f77 mpif77
@@ -118,12 +117,12 @@
}
set mpi.fc mpif90-$mpidb($variant,name)-\$p_name
- foreach compiler \${mpi.list} {
+ foreach compiler \${compilers.list} {
if {\$compiler ne "fc"} {
configure.\$compiler \${prefix}/bin/mpi\${compiler}-$mpidb($variant,name)-\$p_name
}
}
- if {[lsearch -exact \${mpi.list} fc]} {
+ if {[lsearch -exact \${compilers.list} fc]} {
set configure.fc \${prefix}/bin/mpif90-$mpidb($variant,name)-\$p_name
}
@@ -200,16 +199,6 @@
return [expr {[mpi_variant_name] ne ""}]
}
-proc mpi.choose {args} {
- global mpi.list
-
- # zero out the variable before and append args
- set mpi.list {}
- foreach v $args {
- lappend mpi.list $v
- }
-}
-
proc mpi.setup {args} {
global cdb mpidb mpi.variants mpi.require compilers.variants name
Modified: trunk/dports/devel/GASNet/Portfile
===================================================================
--- trunk/dports/devel/GASNet/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/devel/GASNet/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -4,7 +4,7 @@
PortSystem 1.0
PortGroup mpi 1.0
-mpi.choose cc
+compilers.choose cc
mpi.setup require -clang -dragonegg -g95 -gfortran -llvm
PortGroup compiler_blacklist_versions 1.0
Modified: trunk/dports/devel/valgrind/Portfile
===================================================================
--- trunk/dports/devel/valgrind/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/devel/valgrind/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -22,7 +22,6 @@
master_sites http://valgrind.org/downloads/
compilers.choose cc cxx
-mpi.choose
mpi.setup -gcc44 -gcc45 -gcc46
depends_build bin:perl:perl5
Modified: trunk/dports/lang/berkeley_upc/Portfile
===================================================================
--- trunk/dports/lang/berkeley_upc/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/lang/berkeley_upc/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -22,7 +22,6 @@
rmd160 757e76bb3a6796a8d495062f98358460e5ec0b50
compilers.choose cc cxx
-mpi.choose
mpi.setup
depends_lib port:upc \
Modified: trunk/dports/lang/omnicompiler/Portfile
===================================================================
--- trunk/dports/lang/omnicompiler/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/lang/omnicompiler/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -31,7 +31,7 @@
sha256 1d978c918693aabf34d4bf4b4f43e3e91c09ac4bc88a69e8974715e36bcc086f
use_bzip2 yes
-mpi.choose cc fc
+compilers.choose cc fc
mpi.setup require -clang -dragonegg -g95 -gfortran -llvm
if {[variant_isset coarray]} {
mpi.enforce_variant GASNet
Modified: trunk/dports/math/fftw/Portfile
===================================================================
--- trunk/dports/math/fftw/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/math/fftw/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -34,7 +34,6 @@
# don't change configure.cc, etc. since we'll take care of that manually with
# MPICC env var
-mpi.choose
mpi.setup require_fortran
configure.args --enable-type-prefix --enable-threads \
Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/math/fftw-3/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -51,7 +51,6 @@
# don't change configure.cc, etc. since we'll take care of that manually with
# MPICC env var
-mpi.choose
mpi.setup
# blacklist older versions of clang which do not handle the --enable-avx option (#41622, #41673)
Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/math/gnudatalanguage/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -12,7 +12,6 @@
epoch 1
compilers.choose cc cxx
-mpi.choose
mpi.setup -openmpi -openmpi_devel -dragonegg
categories math science
Modified: trunk/dports/math/optpp/Portfile
===================================================================
--- trunk/dports/math/optpp/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/math/optpp/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -21,7 +21,6 @@
rmd160 1f554c4702dedc24150f198e1a1df35ad1bf9a19
compilers.choose cc cxx
-mpi.choose
mpi.setup
patchfiles patch-acx_blas.m4.diff
Modified: trunk/dports/math/plda/Portfile
===================================================================
--- trunk/dports/math/plda/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/math/plda/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -24,7 +24,6 @@
sha256 aae495f96fdbf048b71080dec4506f242044ce40930ad2fdf5ad71e4fedad682
compilers.choose cc cxx
-mpi.choose
mpi.setup
worksrcdir ${name}
Modified: trunk/dports/python/py-scientific/Portfile
===================================================================
--- trunk/dports/python/py-scientific/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/python/py-scientific/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -23,7 +23,6 @@
sha256 ed5c2048a64a83cd56374d6a048c793066d0060e8589f0ec70d95caadbaaa5ed
compilers.choose cc cxx
-mpi.choose
mpi.setup
if {${name} ne ${subport}} {
Modified: trunk/dports/science/apbs/Portfile
===================================================================
--- trunk/dports/science/apbs/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/science/apbs/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -65,7 +65,6 @@
}
}
apbs-mpi {
- mpi.choose
mpi.setup require
revision 0
Modified: trunk/dports/science/cdo/Portfile
===================================================================
--- trunk/dports/science/cdo/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/science/cdo/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -24,7 +24,7 @@
fetch.ignore_sslcert yes
-mpi.choose cc
+compilers.choose cc
mpi.setup -clang -dragonegg
mpi.enforce_variant hdf5
Modified: trunk/dports/science/hdfeos5/Portfile
===================================================================
--- trunk/dports/science/hdfeos5/Portfile 2014-12-24 00:42:36 UTC (rev 129984)
+++ trunk/dports/science/hdfeos5/Portfile 2014-12-24 00:42:39 UTC (rev 129985)
@@ -27,8 +27,8 @@
sha1 35a288cd1bfdde92a4ef9d68f8ee55b536b0f8c3 \
rmd160 34df5cdb6bdc4d06a7658d38aae6fed0b5671557
-mpi.choose cc cxx
-mpi.setup -clang -dragonegg -g95 -gfortran -llvm
+compilers.choose cc cxx
+mpi.setup -clang -dragonegg -llvm
mpi.enforce_variant hdf5
depends_build port:libtool
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141223/f529ca3b/attachment-0001.html>
More information about the macports-changes
mailing list