<!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>[116352] trunk/dports/lang/omnixmp/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/116352">116352</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2014-01-23 12:13:05 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>omnixmp: use mpi portgroup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangomnixmpPortfile">trunk/dports/lang/omnixmp/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangomnixmpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/omnixmp/Portfile (116351 => 116352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/omnixmp/Portfile 2014-01-23 20:13:02 UTC (rev 116351)
+++ trunk/dports/lang/omnixmp/Portfile 2014-01-23 20:13:05 UTC (rev 116352)
</span><span class="lines">@@ -2,9 +2,14 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup mpi 1.0
</ins><span class="cx">
</span><ins>+mpi.choose
+mpi.setup require_fortran -clang -dragonegg -fortran
+
</ins><span class="cx"> name omnixmp
</span><span class="cx"> version 0.6.1
</span><ins>+revision 1
</ins><span class="cx"> categories lang devel parallel
</span><span class="cx"> maintainers takeshi openmaintainer
</span><span class="cx"> description Omni OpenMP/XcalableMP Compiler
</span><span class="lines">@@ -29,11 +34,7 @@
</span><span class="cx"> patch-c-expr.c.diff \
</span><span class="cx"> patch-libxmpf-Makefile.in.diff
</span><span class="cx">
</span><del>-post-patch {
- if {${build_arch} eq "x86_64"} {
- reinplace "s|CPU=i386|CPU=x86_64|g" ${worksrcpath}/configure
- }
-}
</del><ins>+use_parallel_build no
</ins><span class="cx">
</span><span class="cx"> configure.args --prefix=${prefix}/lib/${name} \
</span><span class="cx"> --disable-xmpgpu \
</span><span class="lines">@@ -42,73 +43,30 @@
</span><span class="cx"> --with-cflag=${configure.cflags} \
</span><span class="cx"> --with-cppflag="${configure.cppflags} -I${prefix}/include/libxml2 -I/usr/include -DSIMPLE_SPIN"
</span><span class="cx">
</span><ins>+post-patch {
+ if {${build_arch} eq "x86_64"} {
+ reinplace "s|CPU=i386|CPU=x86_64|g" ${worksrcpath}/configure
+ }
+}
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> ln -s ${prefix}/lib/${name}/bin/xmpcc ${destroot}${prefix}/bin
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset mpich] && ![variant_isset universal]} {
- default_variants-append +openmpi
-} else {
- default_variants-append +mpich
</del><ins>+if {![fortran_variant_isset]} {
+ default_variants-append +gcc48
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-use_parallel_build no
-
-set gcc_versions {4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- set variant_line {variant gcc${ver_no_dot} description "build with gcc${ver_no_dot}"}
-
- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
- continue
- }
-
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
- }
- append variant_line { {}}
-
- eval $variant_line
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
</del><ins>+if {![mpi_variant_isset]} {
+ default_variants-append +mpich
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {${default_fortran_variant} != ""} {
- default_variants-append "${default_fortran_variant}"
-}
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- if {[variant_isset gcc${ver_no_dot}]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc${ver_no_dot}
-
- configure.compiler macports-gcc-${ver}
</del><ins>+pre-configure {
+ if {[mpi_variant_isset]} {
+ configure.args-append --with-mpicc=${mpi.cc} \
+ --with-mpif90=${mpi.fc}
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant openmpi conflicts mpich universal description {build with OpenMPI} {
- depends_lib-append port:openmpi
- configure.args-append --with-mpicc=${prefix}/lib/openmpi/bin/mpicc
- configure.args-append --with-mpif90=${prefix}/lib/openmpi/bin/mpif90
-}
-
-variant mpich2 requires mpich description {Variant remaned as +mpich} {}
-
-variant mpich conflicts openmpi description {build with MPICH} {
- 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
-}
-
</del><span class="cx"> notes \
</span><span class="cx"> ${name} is installed in ${prefix}/lib/${name}.
</span></span></pre>
</div>
</div>
</body>
</html>