<!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>[114894] trunk/dports/_resources/port1.0/group/active_variants-1.1.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/114894">114894</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2013-12-19 07:19:07 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>active_variants 1.1: Only check for appropriate variants of dependencies that are in the dependency tree of the current operation, fixes ghc install without ghc-bootstrap
See https://lists.macosforge.org/pipermail/macports-users/2013-December/034220.html</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupactive_variants11tcl">trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupactive_variants11tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl (114893 => 114894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2013-12-19 11:26:30 UTC (rev 114893)
+++ trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl 2013-12-19 15:19:07 UTC (rev 114894)
</span><span class="lines">@@ -175,13 +175,61 @@
</span><span class="cx">
</span><span class="cx"> # function to be called in pre-configure to check for all items added using
</span><span class="cx"> # require_active_variants
</span><del>-proc _check_require_active_variants {} {
- global _require_active_variants_list
</del><ins>+proc _check_require_active_variants {method} {
+ global _require_active_variants_list PortInfo
+
+ # build a list of all dependencies to be checked in this pass
+ set depends {}
+ set deptypes {}
+
+ # determine the type of dependencies we need to consider
+ switch $method {
+ source {
+ set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run"
+ }
+ archivefetch {
+ set deptypes "depends_lib depends_run"
+ }
+ default {
+ error "active_variants 1.1: internal error: _check_require_active_variants called with unsupported \$method"
+ }
+ }
+
+ # for each type we're considering
+ foreach deptype $deptypes {
+ # check that there are any dependencies by that type
+ if {[info exists PortInfo($deptype)]} {
+ # and for each dependency
+ foreach depspec $PortInfo($deptype) {
+ # resolve names to actual ports
+ set depname [_get_dep_port $depspec]
+
+ # if depname is empty the dependency is already satisfied (e.g.
+ # with bin: dependencies)
+ if {$depname ne ""} {
+ # if the dependency isn't already in the list
+ if {[lsearch -exact $depends $depname] == -1} {
+ # append it
+ lappend depends $depname
+ }
+ }
+ }
+ }
+ }
+
+ ui_debug "Active variants check for ${method}-type install considers ${deptypes}: ${depends}"
+
</ins><span class="cx"> foreach _require_active_variant $_require_active_variants_list {
</span><span class="cx"> set depspec [lindex $_require_active_variant 0]
</span><span class="cx"> set port [_get_dep_port $depspec]
</span><span class="cx"> set required [lindex $_require_active_variant 1]
</span><span class="cx"> set forbidden [lindex $_require_active_variant 2]
</span><ins>+
+ if {[lsearch -exact $depends $port] == -1} {
+ ui_debug "Ignoring active_variants requirement for ${port} because ${method}-type install only considers ${deptypes} and those do not contain ${port}"
+ continue
+ }
+
</ins><span class="cx"> if {[catch {set result [active_variants $depspec $required $forbidden]}] != 0} {
</span><span class="cx"> error "${port} is required, but not active."
</span><span class="cx"> }
</span><span class="lines">@@ -205,12 +253,12 @@
</span><span class="cx">
</span><span class="cx"> # register pre-configure handler that checks for all requested variants
</span><span class="cx"> pre-configure {
</span><del>- _check_require_active_variants
</del><ins>+ _check_require_active_variants source
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # register pre-archivefetch handler that checks for all requested variants
</span><span class="cx"> # this is required when downloading binary archives for a package, because
</span><span class="cx"> # pre-configure is never run for those
</span><span class="cx"> pre-archivefetch {
</span><del>- _check_require_active_variants
</del><ins>+ _check_require_active_variants archivefetch
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>