<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[129985] trunk/dports</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/129985">129985</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2014-12-23 16:42:39 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupmpi10tcl">trunk/dports/_resources/port1.0/group/mpi-1.0.tcl</a></li>
<li><a href="#trunkdportsdevelGASNetPortfile">trunk/dports/devel/GASNet/Portfile</a></li>
<li><a href="#trunkdportsdevelvalgrindPortfile">trunk/dports/devel/valgrind/Portfile</a></li>
<li><a href="#trunkdportslangberkeley_upcPortfile">trunk/dports/lang/berkeley_upc/Portfile</a></li>
<li><a href="#trunkdportslangomnicompilerPortfile">trunk/dports/lang/omnicompiler/Portfile</a></li>
<li><a href="#trunkdportsmathfftwPortfile">trunk/dports/math/fftw/Portfile</a></li>
<li><a href="#trunkdportsmathfftw3Portfile">trunk/dports/math/fftw-3/Portfile</a></li>
<li><a href="#trunkdportsmathgnudatalanguagePortfile">trunk/dports/math/gnudatalanguage/Portfile</a></li>
<li><a href="#trunkdportsmathoptppPortfile">trunk/dports/math/optpp/Portfile</a></li>
<li><a href="#trunkdportsmathpldaPortfile">trunk/dports/math/plda/Portfile</a></li>
<li><a href="#trunkdportspythonpyscientificPortfile">trunk/dports/python/py-scientific/Portfile</a></li>
<li><a href="#trunkdportsscienceapbsPortfile">trunk/dports/science/apbs/Portfile</a></li>
<li><a href="#trunkdportssciencecdoPortfile">trunk/dports/science/cdo/Portfile</a></li>
<li><a href="#trunkdportssciencehdfeos5Portfile">trunk/dports/science/hdfeos5/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupmpi10tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/mpi-1.0.tcl (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> default mpi.require 0
</span><span class="cx"> default mpi.required_variants {}
</span><span class="cx">
</span><del>-set mpi.list {cc cxx f77 f90 fc}
</del><span class="cx"> set mpi.cc mpicc
</span><span class="cx"> set mpi.cxx mpicxx
</span><span class="cx"> set mpi.f77 mpif77
</span><span class="lines">@@ -118,12 +117,12 @@
</span><span class="cx"> }
</span><span class="cx"> set mpi.fc mpif90-$mpidb($variant,name)-\$p_name
</span><span class="cx">
</span><del>- foreach compiler \${mpi.list} {
</del><ins>+ foreach compiler \${compilers.list} {
</ins><span class="cx"> if {\$compiler ne "fc"} {
</span><span class="cx"> configure.\$compiler \${prefix}/bin/mpi\${compiler}-$mpidb($variant,name)-\$p_name
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if {[lsearch -exact \${mpi.list} fc]} {
</del><ins>+ if {[lsearch -exact \${compilers.list} fc]} {
</ins><span class="cx"> set configure.fc \${prefix}/bin/mpif90-$mpidb($variant,name)-\$p_name
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -200,16 +199,6 @@
</span><span class="cx"> return [expr {[mpi_variant_name] ne ""}]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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
- }
-}
-
</del><span class="cx"> proc mpi.setup {args} {
</span><span class="cx"> global cdb mpidb mpi.variants mpi.require compilers.variants name
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelGASNetPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/GASNet/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> PortGroup mpi 1.0
</span><del>-mpi.choose cc
</del><ins>+compilers.choose cc
</ins><span class="cx"> mpi.setup require -clang -dragonegg -g95 -gfortran -llvm
</span><span class="cx">
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span></span></pre></div>
<a id="trunkdportsdevelvalgrindPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/valgrind/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> master_sites http://valgrind.org/downloads/
</span><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><del>-mpi.choose
</del><span class="cx"> mpi.setup -gcc44 -gcc45 -gcc46
</span><span class="cx">
</span><span class="cx"> depends_build bin:perl:perl5
</span></span></pre></div>
<a id="trunkdportslangberkeley_upcPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/berkeley_upc/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx"> rmd160 757e76bb3a6796a8d495062f98358460e5ec0b50
</span><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><del>-mpi.choose
</del><span class="cx"> mpi.setup
</span><span class="cx">
</span><span class="cx"> depends_lib port:upc \
</span></span></pre></div>
<a id="trunkdportslangomnicompilerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/omnicompiler/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> sha256 1d978c918693aabf34d4bf4b4f43e3e91c09ac4bc88a69e8974715e36bcc086f
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-mpi.choose cc fc
</del><ins>+compilers.choose cc fc
</ins><span class="cx"> mpi.setup require -clang -dragonegg -g95 -gfortran -llvm
</span><span class="cx"> if {[variant_isset coarray]} {
</span><span class="cx"> mpi.enforce_variant GASNet
</span></span></pre></div>
<a id="trunkdportsmathfftwPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/fftw/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> # don't change configure.cc, etc. since we'll take care of that manually with
</span><span class="cx"> # MPICC env var
</span><del>-mpi.choose
</del><span class="cx"> mpi.setup require_fortran
</span><span class="cx">
</span><span class="cx"> configure.args --enable-type-prefix --enable-threads \
</span></span></pre></div>
<a id="trunkdportsmathfftw3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/fftw-3/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx">
</span><span class="cx"> # don't change configure.cc, etc. since we'll take care of that manually with
</span><span class="cx"> # MPICC env var
</span><del>-mpi.choose
</del><span class="cx"> mpi.setup
</span><span class="cx">
</span><span class="cx"> # blacklist older versions of clang which do not handle the --enable-avx option (#41622, #41673)
</span></span></pre></div>
<a id="trunkdportsmathgnudatalanguagePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/gnudatalanguage/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> epoch 1
</span><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><del>-mpi.choose
</del><span class="cx"> mpi.setup -openmpi -openmpi_devel -dragonegg
</span><span class="cx">
</span><span class="cx"> categories math science
</span></span></pre></div>
<a id="trunkdportsmathoptppPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/optpp/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> rmd160 1f554c4702dedc24150f198e1a1df35ad1bf9a19
</span><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><del>-mpi.choose
</del><span class="cx"> mpi.setup
</span><span class="cx">
</span><span class="cx"> patchfiles patch-acx_blas.m4.diff
</span></span></pre></div>
<a id="trunkdportsmathpldaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/plda/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> sha256 aae495f96fdbf048b71080dec4506f242044ce40930ad2fdf5ad71e4fedad682
</span><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><del>-mpi.choose
</del><span class="cx"> mpi.setup
</span><span class="cx">
</span><span class="cx"> worksrcdir ${name}
</span></span></pre></div>
<a id="trunkdportspythonpyscientificPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-scientific/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> sha256 ed5c2048a64a83cd56374d6a048c793066d0060e8589f0ec70d95caadbaaa5ed
</span><span class="cx">
</span><span class="cx"> compilers.choose cc cxx
</span><del>-mpi.choose
</del><span class="cx"> mpi.setup
</span><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span></span></pre></div>
<a id="trunkdportsscienceapbsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/apbs/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> apbs-mpi {
</span><del>- mpi.choose
</del><span class="cx"> mpi.setup require
</span><span class="cx">
</span><span class="cx"> revision 0
</span></span></pre></div>
<a id="trunkdportssciencecdoPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/cdo/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> fetch.ignore_sslcert yes
</span><span class="cx">
</span><del>-mpi.choose cc
</del><ins>+compilers.choose cc
</ins><span class="cx"> mpi.setup -clang -dragonegg
</span><span class="cx"> mpi.enforce_variant hdf5
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencehdfeos5Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/hdfeos5/Portfile (129984 => 129985)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> sha1 35a288cd1bfdde92a4ef9d68f8ee55b536b0f8c3 \
</span><span class="cx"> rmd160 34df5cdb6bdc4d06a7658d38aae6fed0b5671557
</span><span class="cx">
</span><del>-mpi.choose cc cxx
-mpi.setup -clang -dragonegg -g95 -gfortran -llvm
</del><ins>+compilers.choose cc cxx
+mpi.setup -clang -dragonegg -llvm
</ins><span class="cx"> mpi.enforce_variant hdf5
</span><span class="cx">
</span><span class="cx"> depends_build port:libtool
</span></span></pre>
</div>
</div>
</body>
</html>