<!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>[149472] trunk/dports/science</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/149472">149472</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2016-06-22 10:47:06 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mpich, mpich-devel, openmpi, openmpi-devel: Use compilers portgroup for Fortran variants of non-gcc subports, for simplicity and to avoid having to maintain another list of the available gcc ports. Closes ticket #51550.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencempichPortfile">trunk/dports/science/mpich/Portfile</a></li>
<li><a href="#trunkdportsscienceopenmpiPortfile">trunk/dports/science/openmpi/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencempichPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/mpich/Portfile (149471 => 149472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/mpich/Portfile 2016-06-22 16:47:23 UTC (rev 149471)
+++ trunk/dports/science/mpich/Portfile 2016-06-22 17:47:06 UTC (rev 149472)
</span><span class="lines">@@ -246,80 +246,21 @@
</span><span class="cx"> } else {
</span><span class="cx"> append long_description " (AND THE FORTRAN COMPILER SELECTED BY THE VARIANT, IF ANY)"
</span><span class="cx">
</span><del>- set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9 5 6 7}
- set default_fortran_variant +${compilers.gcc_default}
- set g95_conflicts {}
</del><ins>+ compilers.choose fc f77 f90
+ compilers.setup -dragonegg default_fortran
</ins><span class="cx">
</span><del>- foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
</del><ins>+ if {[fortran_variant_isset]} {
+ configure.args-delete --disable-f77 --disable-fc
+ configure.args-append --enable-f77 --enable-fc
+ select.file ${filespath}/${name}-${cname}-fortran
</ins><span class="cx">
</span><del>- set variant_line {variant gcc${ver_no_dot} description \
- "build with gfortran from gcc${ver_no_dot}" conflicts g95}
</del><ins>+ # at least currently, the Fortran variants gccX and g95 match the name of the ports
+ depends_lib-append port:[fortran_variant_name]
</ins><span class="cx">
</span><del>- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
- continue
- }
-
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
</del><ins>+ if {[variant_isset g95]} {
+ configure.args-append lt_cv_ld_force_load=no
</ins><span class="cx"> }
</span><del>- append variant_line { {}}
-
- eval $variant_line
-
- append g95_conflicts " conflicts gcc${ver_no_dot}"
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
</del><span class="cx"> }
</span><del>-
- eval [concat {variant g95 description {build with g95}} \
- $g95_conflicts {{}}]
-
- if {[variant_isset g95]} {
- if {${default_fortran_variant} != "+g95"} {
- set default_fortran_variant ""
- }
- }
-
- if {${default_fortran_variant} != ""} {
- default_variants "${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 \
- port:gcc${ver_no_dot}
-
- configure.args-delete --disable-f77 --disable-fc
- configure.args-append --enable-f77 --enable-fc
- select.file ${filespath}/${name}-${cname}-fortran
-
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
- }
- }
-
- if {[variant_isset g95]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc \
- port:g95
-
- configure.args-delete --disable-f77 --disable-fc
- configure.args-append \
- --enable-f77 --enable-fc lt_cv_ld_force_load=no
- select.file ${filespath}/${name}-${cname}-fortran
-
- configure.fc ${prefix}/bin/g95
- configure.f77 ${prefix}/bin/g95
- configure.f90 ${prefix}/bin/g95
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set devnotes ""
</span></span></pre></div>
<a id="trunkdportsscienceopenmpiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/openmpi/Portfile (149471 => 149472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/openmpi/Portfile 2016-06-22 16:47:23 UTC (rev 149471)
+++ trunk/dports/science/openmpi/Portfile 2016-06-22 17:47:06 UTC (rev 149472)
</span><span class="lines">@@ -209,74 +209,16 @@
</span><span class="cx"> } else {
</span><span class="cx"> append long_description " (AND THE FORTRAN COMPILER SELECTED BY THE VARIANT, IF ANY)"
</span><span class="cx">
</span><del>- set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9 5 6 7}
- set default_fortran_variant +${compilers.gcc_default}
- set g95_conflicts {}
</del><ins>+ compilers.choose fc
+ compilers.setup -dragonegg default_fortran
</ins><span class="cx">
</span><del>- foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- set variant_line {variant gcc${ver_no_dot} description \
- "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
- 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
-
- append g95_conflicts " conflicts gcc${ver_no_dot}"
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
- }
-
- eval [concat {variant g95 description {build with g95}} \
- $g95_conflicts {{}}]
-
- if {[variant_isset g95]} {
- if {${default_fortran_variant} != "+g95"} {
- set default_fortran_variant ""
- }
- }
-
- if {${default_fortran_variant} != ""} {
- default_variants "${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 \
- port:gcc${ver_no_dot}
-
- configure.args-delete --disable-mpi-fortran
- configure.args-append --enable-mpi-fortran
- select.file ${filespath}/${name}-${cname}-fortran
-
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- }
- }
-
- if {[variant_isset g95]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc \
- port:g95
-
</del><ins>+ if {[fortran_variant_isset]} {
</ins><span class="cx"> configure.args-delete --disable-mpi-fortran
</span><span class="cx"> configure.args-append --enable-mpi-fortran
</span><span class="cx"> select.file ${filespath}/${name}-${cname}-fortran
</span><span class="cx">
</span><del>- configure.fc ${prefix}/bin/g95
</del><ins>+ # at least currently, the Fortran variants gccX and g95 match the name of the ports
+ depends_lib-append port:[fortran_variant_name]
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> set devnotes ""
</span></span></pre>
</div>
</div>
</body>
</html>