<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/49c89f47c4d2843c6ae572fb9373a67bb8b02a21">https://github.com/macports/mpbb/commit/49c89f47c4d2843c6ae572fb9373a67bb8b02a21</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 49c89f4 open deps requiring build with correct variants
</span>49c89f4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 49c89f47c4d2843c6ae572fb9373a67bb8b02a21
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jan 27 13:08:41 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> open deps requiring build with correct variants
</span>---
tools/dependencies.tcl | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/dependencies.tcl b/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index eabd751..1ca705b 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,7 +215,7 @@ proc get_maintainers {args} {
</span> return [join $retlist ,]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc open_port {portname} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc open_port {portname {variations {}}} {
</span> try {
set result [mportlookup $portname]
if {[llength $result] < 2} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -229,13 +229,14 @@ proc open_port {portname} {
</span> }
lassign $result portname portinfo
try {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set mport [mportopen [dict get $portinfo porturl] [dict create subport $portname] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mport [mportopen [dict get $portinfo porturl] [dict create subport $portname] $variations]
</span> } on error {eMessage} {
ui_error "mportopen $portname from [dict get $portinfo porturl] failed: $eMessage"
exit 2
}
set portinfo [dict merge $portinfo [mportinfo $mport]]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set portinfo requested_variations $variations
</span> global mportinfo_array
if {![dict exists $mportinfo_array $mport]} {
dict set mportinfo_array $mport $portinfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -505,7 +506,7 @@ proc install_dep_source {depinfo} {
</span> close_open_mports
clean_workdirs
set mportinfo_array [dict create]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set ditem [lindex [open_port [dict get $depinfo name]] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ditem [lindex [open_port [dict get $depinfo name] [dict get $depinfo requested_variations]] 0]
</span> # Ensure archivefetch is not attempted at all
set workername [ditem_key $ditem workername]
$workername eval [list set portutil::archive_available_result 0]
</pre><pre style='margin:0'>
</pre>