<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d2e1de0470c274bfbe3cf6692f8e41884aab39df">https://github.com/macports/macports-ports/commit/d2e1de0470c274bfbe3cf6692f8e41884aab39df</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 d2e1de0470c rust_build pg: mirror distfiles for all platforms
</span>d2e1de0470c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d2e1de0470c274bfbe3cf6692f8e41884aab39df
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jan 25 05:52:31 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> rust_build pg: mirror distfiles for all platforms
</span>---
_resources/port1.0/group/rust_build-1.0.tcl | 41 ++++++++++++++++++-----------
1 file changed, 26 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/rust_build-1.0.tcl b/_resources/port1.0/group/rust_build-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index baf52f09695..9f4a8766a81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/rust_build-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/rust_build-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,17 +267,24 @@ proc rust_build::callback {} {
</span> }
if { [variant_exists mirror_all_architectures] && [variant_isset mirror_all_architectures] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch [option configure.universal_archs] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lassign [rust_build.stage0_info ${arch}] stage0_version stage0_arch stage0_vendor stage0_os_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${stage0_vendor} ne "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${stage0_vendor} eq "macports" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set full_stage0_version ${stage0_version}+0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set full_stage0_version ${stage0_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch {arm64 i386 x86_64} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$arch eq "arm64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mdts [list 11.0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mdts [list 10.5 10.6 10.7 10.12]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach mdt $mdts {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lassign [rust_build.stage0_info ${arch} ${mdt}] stage0_version stage0_arch stage0_vendor stage0_os_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${stage0_vendor} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${stage0_vendor} eq "macports" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set full_stage0_version ${stage0_version}+0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set full_stage0_version ${stage0_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set binTag ${full_stage0_version}-[option triplet.cpu.${stage0_arch}]-${stage0_vendor}-[option triplet.os]${stage0_os_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-delete ${component}-${binTag}${extract.suffix}:${stage0_vendor}_vendor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append ${component}-${binTag}${extract.suffix}:${stage0_vendor}_vendor
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set binTag ${full_stage0_version}-[option triplet.cpu.${stage0_arch}]-${stage0_vendor}-[option triplet.os]${stage0_os_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-delete ${component}-${binTag}${extract.suffix}:${stage0_vendor}_vendor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append ${component}-${binTag}${extract.suffix}:${stage0_vendor}_vendor
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -316,7 +323,11 @@ port::register_callback rust_build::callback
</span> # stage0_arch: architecture of the stage0 compiler
# stage0_vendor: apple (upstream), macports (built via MacPorts port rust-bootstrap), or "" (use locally built port)
# stage0_os_version: append to operatingsystem part of target triplet machine-vendor-operatingsystem in name of stage0 compiler
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc rust_build.stage0_info {arch} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc rust_build.stage0_info {arch {mdt {}}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$mdt eq {}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mdt [option macosx_deployment_target]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# are we building a stage0 compiler or just using one?
if { [join [lrange [split [option subport] -] 0 1] -] eq "rust-bootstrap" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,7 +350,7 @@ proc rust_build.stage0_info {arch} {
</span> }
# rust-bootstrap requires `macosx_deployment_target` instead of `os.major`
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [option os.platform] eq "darwin" && [vercmp [option macosx_deployment_target] >= "10.12"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option os.platform] eq "darwin" && [vercmp $mdt >= "10.12"] } {
</span> if { ${arch} in "arm64 x86_64" } {
# upstream support
# see https://doc.rust-lang.org/nightly/rustc/platform-support.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -358,7 +369,7 @@ proc rust_build.stage0_info {arch} {
</span> return [list ${stage0_version} ${arch} "macports" ""]
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { [option os.platform] eq "darwin" && [vercmp [option macosx_deployment_target] >= "10.7"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { [option os.platform] eq "darwin" && [vercmp $mdt >= "10.7"] } {
</span> if { ${building_stage0} } {
# use `platforms` in rust-bootstap port to ensure upstream compiler runs
return [list ${stage0_version} "x86_64" "apple" ""]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,7 +377,7 @@ proc rust_build.stage0_info {arch} {
</span> # no upstream support; use MacPorts compiler
return [list ${stage0_version} ${arch} "macports" "11"]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { [option os.platform] eq "darwin" && [vercmp [option macosx_deployment_target] >= "10.6"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { [option os.platform] eq "darwin" && [vercmp $mdt >= "10.6"] } {
</span> if { ${building_stage0} } {
# use local port since it must be build without thread-local storage even of OS supports it
return [list [option rust_build.version] [option configure.build_arch] "" ""]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -374,7 +385,7 @@ proc rust_build.stage0_info {arch} {
</span> # no upstream support; use MacPorts compiler
return [list ${stage0_version} ${arch} "macports" "10"]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { [option os.platform] eq "darwin" && [vercmp [option macosx_deployment_target] >= "10.5"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { [option os.platform] eq "darwin" && [vercmp $mdt >= "10.5"] } {
</span> if { ${building_stage0} } {
# use local port since it must be built without thread-local storage even of OS supports it
return [list [option rust_build.version] [option configure.build_arch] "" ""]
</pre><pre style='margin:0'>
</pre>