<!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>[142409] 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/142409">142409</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2015-11-10 21:07:45 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>compilers portgroup:
* Add proc 'set_variants_conflict' which can be used for setting some compilers variants outside the portgroup.
* Add proc 'c_variant_isset'.
* Add variable 'compilers.libfortran' for use in linking Fortran code with C or C++.</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 (142408 => 142409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2015-11-11 05:03:28 UTC (rev 142408)
+++ trunk/dports/_resources/port1.0/group/compilers-1.0.tcl 2015-11-11 05:07:45 UTC (rev 142409)
</span><span class="lines">@@ -44,6 +44,9 @@
</span><span class="cx"> # Possible arguments: cc cxx cpp objc fc f77 f90
</span><span class="cx"> # A list of which of these compilers you want to be set by the variants (e.g. ${configure.cc}).
</span><span class="cx"> # The default is all of them. Must come before compilers.setup in the Portfile to have an effect.
</span><ins>+# compilers.set_variants_conflict {args}
+# Add specified variants to the conflicts list of all variants created by this PortGroup.
+# Useful if another compiler variant is created explicitly in the Portfile.
</ins><span class="cx"> # compilers.setup {args}
</span><span class="cx"> # Possible arguments: any compiler variant name with a minus removes it from the list of variants, e.g. -llvm.
</span><span class="cx"> # -gcc, -dragonegg, -clang remove all compilers of that category. -fortran removes gfortran and g95.
</span><span class="lines">@@ -51,8 +54,10 @@
</span><span class="cx"> # e.g. if choose is just f90, clang variants will not be added.
</span><span class="cx"> # This procedure must be in the Portfile to create all the compiler variants and set the default.
</span><span class="cx"> # Appropriate conflicts, dependencies, etc. are created too.
</span><ins>+# If a variant is declared already in the Portfile before this line, it will not be redefined.
</ins><span class="cx"> # c_active_variant_name {depspec}: which C variant a dependency has set
</span><span class="cx"> # c_variant_name {}: which C variant is set
</span><ins>+# c_variant_isset {}: is a C variant set
</ins><span class="cx"> # fortran_active_variant_name {depspec}: which Fortran variant a dependency has set
</span><span class="cx"> # fortran_variant_name {}: which Fortran variant is set
</span><span class="cx"> # clang_variant_isset {}: is a clang variant set
</span><span class="lines">@@ -66,6 +71,7 @@
</span><span class="cx"> #
</span><span class="cx"> # The compilers.gcc_default variable may be useful for setting a default compiler variant
</span><span class="cx"> # even in ports that do not use this PortGroup's automatic creation of variants.
</span><ins>+# compilers.libfortran is for use in linking Fortran code with the C or C++ compiler
</ins><span class="cx">
</span><span class="cx"> PortGroup active_variants 1.1
</span><span class="cx">
</span><span class="lines">@@ -79,6 +85,8 @@
</span><span class="cx"> default compilers.setup_done 0
</span><span class="cx"> default compilers.required_c {}
</span><span class="cx"> default compilers.required_f {}
</span><ins>+default compilers.variants_conflict {}
+default compilers.libfortran {}
</ins><span class="cx">
</span><span class="cx"> # also set a default gcc version
</span><span class="cx"> set compilers.gcc_default gcc5
</span><span class="lines">@@ -99,6 +107,8 @@
</span><span class="cx"> set cdb(gcc$v,descrip) "MacPorts gcc $version"
</span><span class="cx"> set cdb(gcc$v,depends) port:gcc$v
</span><span class="cx"> set cdb(gcc$v,dependsl) path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><ins>+ set cdb(gcc$v,libfortran) ${prefix}/lib/gcc$v/libgfortran.dylib
+ # note: above is ultimately a symlink to ${prefix}/lib/libgcc/libgfortran.3.dylib
</ins><span class="cx"> set cdb(gcc$v,dependsd) port:g95
</span><span class="cx"> set cdb(gcc$v,dependsa) gcc$v
</span><span class="cx"> set cdb(gcc$v,conflict) "gfortran g95"
</span><span class="lines">@@ -124,6 +134,7 @@
</span><span class="cx"> set cdb(clang$v,descrip) "MacPorts clang $version"
</span><span class="cx"> set cdb(clang$v,depends) port:clang-$version
</span><span class="cx"> set cdb(clang$v,dependsl) ""
</span><ins>+ set cdb(clang$v,libfortran) ""
</ins><span class="cx"> set cdb(clang$v,dependsd) ""
</span><span class="cx"> set cdb(clang$v,dependsa) clang-$version
</span><span class="cx"> set cdb(clang$v,conflict) ""
</span><span class="lines">@@ -145,6 +156,7 @@
</span><span class="cx"> set cdb(dragonegg3$v,descrip) "MacPorts dragonegg 3.$v"
</span><span class="cx"> set cdb(dragonegg3$v,depends) path:bin/dragonegg-3.$v-gcc:dragonegg-3.$v
</span><span class="cx"> set cdb(dragonegg3$v,dependsl) path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><ins>+ set cdb(dragonegg3$v,libfortran) ${prefix}/lib/gcc46/libgfortran.dylib
</ins><span class="cx"> set cdb(dragonegg3$v,dependsd) port:g95
</span><span class="cx"> set cdb(dragonegg3$v,dependsa) dragonegg-3.$v
</span><span class="cx"> set cdb(dragonegg3$v,conflict) "gfortran g95"
</span><span class="lines">@@ -162,6 +174,7 @@
</span><span class="cx"> set cdb(llvm,descrip) "Apple native llvm-gcc 4.2"
</span><span class="cx"> set cdb(llvm,depends) bin:llvm-gcc-4.2:llvm-gcc42
</span><span class="cx"> set cdb(llvm,dependsl) ""
</span><ins>+set cdb(llvm,libfortran) ""
</ins><span class="cx"> set cdb(llvm,dependsd) ""
</span><span class="cx"> set cdb(llvm,dependsa) ""
</span><span class="cx"> set cdb(llvm,conflict) ""
</span><span class="lines">@@ -180,6 +193,7 @@
</span><span class="cx"> set cdb(gfortran,descrip) "$cdb(${compilers.gcc_default},descrip) Fortran"
</span><span class="cx"> set cdb(gfortran,depends) $cdb(${compilers.gcc_default},depends)
</span><span class="cx"> set cdb(gfortran,dependsl) $cdb(${compilers.gcc_default},dependsl)
</span><ins>+set cdb(gfortran,libfortran) $cdb(${compilers.gcc_default},libfortran)
</ins><span class="cx"> set cdb(gfortran,dependsd) $cdb(${compilers.gcc_default},dependsd)
</span><span class="cx"> set cdb(gfortran,dependsa) $cdb(${compilers.gcc_default},dependsa)
</span><span class="cx"> set cdb(gfortran,conflict) $cdb(${compilers.gcc_default},conflict)
</span><span class="lines">@@ -196,6 +210,7 @@
</span><span class="cx"> set cdb(g95,descrip) "g95 Fortran"
</span><span class="cx"> set cdb(g95,depends) port:g95
</span><span class="cx"> set cdb(g95,dependsl) ""
</span><ins>+set cdb(g95,libfortran) ${prefix}/lib/g95/x86_64-apple-darwin14/4.2.4/libf95.a
</ins><span class="cx"> set cdb(g95,dependsd) ""
</span><span class="cx"> set cdb(g95,dependsa) g95
</span><span class="cx"> set cdb(g95,conflict) ""
</span><span class="lines">@@ -217,9 +232,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+proc compilers.set_variants_conflict {args} {
+ global compilers.variants_conflict
+
+ lappend compilers.variants_conflict $args
+}
+
</ins><span class="cx"> proc compilers.setup_variants {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 compilers.list
</span><ins>+ global compilers.variants_conflict
</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">@@ -258,7 +280,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 ${compilers.list} {
</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">@@ -275,13 +297,14 @@
</span><span class="cx"> eval [subst {
</span><span class="cx"> variant ${variant} description \
</span><span class="cx"> {Build using the $cdb($variant,descrip) compiler} \
</span><del>- conflicts $c {
</del><ins>+ conflicts $c ${compilers.variants_conflict} {
</ins><span class="cx">
</span><span class="cx"> depends_build-append $cdb($variant,depends)
</span><span class="cx"> depends_lib-append $cdb($variant,dependsl)
</span><span class="cx"> depends_lib-delete $cdb($variant,dependsd)
</span><span class="cx"> depends_skip_archcheck $cdb($variant,dependsa)
</span><span class="cx">
</span><ins>+ set compilers.libfortran $cdb($variant,libfortran)
</ins><span class="cx"> $comp
</span><span class="cx"> }
</span><span class="cx"> }]
</span><span class="lines">@@ -325,6 +348,10 @@
</span><span class="cx"> return ""
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+proc c_variant_isset {} {
+ return [expr {[c_variant_name] ne ""}]
+}
+
</ins><span class="cx"> proc fortran_active_variant_name {depspec} {
</span><span class="cx"> global compilers.fortran_variants
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>