<!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>[116361] trunk/dports/science/raxml/Portfile</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/116361">116361</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2014-01-23 12:13:35 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>raxml: use mpi portgroup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceraxmlPortfile">trunk/dports/science/raxml/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceraxmlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/raxml/Portfile (116360 => 116361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/raxml/Portfile        2014-01-23 20:13:32 UTC (rev 116360)
+++ trunk/dports/science/raxml/Portfile        2014-01-23 20:13:35 UTC (rev 116361)
</span><span class="lines">@@ -3,7 +3,11 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><ins>+PortGroup mpi 1.0
</ins><span class="cx">
</span><ins>+compilers.choose cc
+mpi.setup
+
</ins><span class="cx"> github.setup stamatak standard-RAxML 7.7.6 v
</span><span class="cx"> checksums sha256 7562b307bc50e38162f104271793a1c8f98f866c2342bea21afe6df6a982fd82 \
</span><span class="cx"> rmd160 da76d6623515b7d8f78a69aaf4eec713508789af
</span><span class="lines">@@ -28,28 +32,30 @@
</span><span class="cx">
</span><span class="cx"> #Use the HYBRID implementation
</span><span class="cx">
</span><del>-variant hybrid conflicts pthreads mpi description {Hybrid MPI implementation} {
- depends_lib-append port:openmpi
</del><ins>+variant hybrid conflicts pthreads description {Hybrid MPI implementation} {
+ if {![mpi_variant_isset]} {
+ return -code error "$name: Variant hybrid requires an mpi variant"
+ }
</ins><span class="cx"> set HPCm ".HYBRID"
</span><span class="cx"> set HPCb "-HYBRID"
</span><del>- configure.cc ${prefix}/bin/openmpicc
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#Use the MPI implementation
-variant mpi conflicts pthreads hybrid description {MPI implementation} {
- depends_lib-append port:openmpi
</del><ins>+#Use the MPI implementation if hybrid is not selected
+if {[mpi_variant_isset] && ![variant_isset hybrid]} {
</ins><span class="cx"> set HPCm ".MPI"
</span><span class="cx"> set HPCb "-MPI"
</span><del>- configure.cc ${prefix}/bin/openmpicc
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #Use the pthreads implementation (default)
</span><del>-variant pthreads conflicts mpi hybrid description {Pthreads implementation} {
</del><ins>+variant pthreads conflicts hybrid description {Pthreads implementation} {
+ if {[mpi_variant_isset]} {
+ return -code error "$name: Variant pthreads conflicts with mpi"
+ }
</ins><span class="cx"> set HPCm ".PTHREADS"
</span><span class="cx"> set HPCb "-PTHREADS"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset mpi]} {
</del><ins>+if {![mpi_variant_isset]} {
</ins><span class="cx"> default_variants +pthreads
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -61,6 +67,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant avx conflicts sse3 description {Use the AVX extended instruction set from Intel i7 (sandy bridge) and AMD Bulldozer} {
</span><ins>+ pre-fetch {
+ if {![avx_compiler_isset]} {
+ return -code error "$name: Variant avx needs a clang-derived compiler"
+ }
+ }
</ins><span class="cx"> set EXTm ".AVX"
</span><span class="cx"> set EXTb "-AVX"
</span><span class="cx"> }
</span><span class="lines">@@ -80,10 +91,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#Pass in architecture information
-build.args EXTRA_CFLAGS="${configure.cc_archflags}" \
- LDFLAGS="${configure.ld_archflags}"
-
</del><span class="cx"> #Make sure we are using the correct Makefile for this variant combo
</span><span class="cx"> pre-build {
</span><span class="cx"> build.pre_args -f Makefile${EXTm}${HPCm}.gcc
</span></span></pre>
</div>
</div>
</body>
</html>