<!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>[116294] trunk/dports/_resources/port1.0/group/compilers-1.0.tcl</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/116294">116294</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2014-01-23 12:07:55 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>compilers-1.0: factor out logic for choosing compilers for a fortran-only mode</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupcompilers10tcl">trunk/dports/_resources/port1.0/group/compilers-1.0.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupcompilers10tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/compilers-1.0.tcl (116293 => 116294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2014-01-23 20:07:49 UTC (rev 116293)
+++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2014-01-23 20:07:55 UTC (rev 116294)
</span><span class="lines">@@ -45,6 +45,8 @@
</span><span class="cx"> default compilers.require_fortran 0
</span><span class="cx"> default compilers.setup_done 0
</span><span class="cx">
</span><ins>+set compilers.list {cc cxx cpp objc fc f77 f90}
+
</ins><span class="cx"> # build database of gcc 4{4..9} compiler attributes
</span><span class="cx"> set gcc_versions {4 5 6 7 8 9}
</span><span class="cx"> foreach v ${gcc_versions} {
</span><span class="lines">@@ -134,7 +136,8 @@
</span><span class="cx"> set cdb(llvm,f77) ""
</span><span class="cx"> set cdb(llvm,f90) ""
</span><span class="cx">
</span><del>-# and lastly we add a gfortran and g95 variant for use with clang*
</del><ins>+# and lastly we add a gfortran and g95 variant for use with clang*; note that
+# we don't need gfortran when we are in an "only-fortran" mode
</ins><span class="cx"> set cdb(gfortran,variant) gfortran
</span><span class="cx"> set cdb(gfortran,compiler) gfortran
</span><span class="cx"> set cdb(gfortran,descrip) "Fortran compiler from gcc47"
</span><span class="lines">@@ -185,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> proc compilers.setup_variants {args} {
</span><span class="cx"> global cdb compilers.variants compilers.clang_variants compilers.gcc_variants
</span><del>- global compilers.dragonegg_variants compilers.fortran_variants
</del><ins>+ global compilers.dragonegg_variants compilers.fortran_variants compilers.list
</ins><span class="cx">
</span><span class="cx"> foreach variant [split $args] {
</span><span class="cx"> if {$cdb($variant,f77) ne ""} {
</span><span class="lines">@@ -240,7 +243,7 @@
</span><span class="cx"> # configure.compiler because of dragonegg and possibly other new
</span><span class="cx"> # compilers that aren't in macports portconfigure.tcl
</span><span class="cx"> set comp ""
</span><del>- foreach compiler {cc cxx cpp objc fc f77 f90} {
</del><ins>+ foreach compiler ${compilers.list} {
</ins><span class="cx"> if {$cdb($variant,$compiler) ne ""} {
</span><span class="cx"> append comp [subst {
</span><span class="cx"> configure.$compiler $cdb($variant,$compiler)
</span><span class="lines">@@ -322,15 +325,45 @@
</span><span class="cx"> return [concat $L $A]
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+proc compilers.choose {args} {
+ global compilers.list
+
+ # zero out the variable before and append args
+ set compilers.list {}
+ foreach v $args {
+ lappend compilers.list $v
+ }
+}
+
+proc compilers.is_fortran_only {} {
+ global compilers.list
+
+ foreach c {cc cxx cpp objc} {
+ if {[lsearch -exact ${compilers.list} $c] >= 0} {
+ return 0
+ }
+ }
+
+ return 1
+}
+
</ins><span class="cx"> proc compilers.setup {args} {
</span><span class="cx"> global cdb compilers.variants compilers.clang_variants compilers.gcc_variants
</span><span class="cx"> global compilers.dragonegg_variants compilers.fortran_variants
</span><del>- global compilers.require_fortran compilers.setup_done
</del><ins>+ global compilers.require_fortran compilers.setup_done compilers.list
</ins><span class="cx">
</span><span class="cx"> if {!${compilers.setup_done}} {
</span><span class="cx"> set add_list {}
</span><span class="cx"> set remove_list ${compilers.variants}
</span><span class="cx">
</span><ins>+ # if we are only setting fortran compilers, then we are in "only fortran
+ # mode", i.e. we just need +gccXY and +dragoneggXY for the fortran
+ # compilers so we remove +clangXY and +llvm
+ if {[compilers.is_fortran_only]} {
+ # remove gfortran since that only exists to "complete" clang/llvm
+ set remove_list [remove_from_list ${compilers.fortran_variants} gfortran]
+ }
+
</ins><span class="cx"> foreach v $args {
</span><span class="cx"> # if any negated compiler (e.g. -gcc47) is specified then we are
</span><span class="cx"> # removing from the default, complete list
</span></span></pre>
</div>
</div>
</body>
</html>