<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/32a652be78070a8546243a4e3b26d6597c31bd7e">https://github.com/macports/macports-ports/commit/32a652be78070a8546243a4e3b26d6597c31bd7e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 32a652be78070a8546243a4e3b26d6597c31bd7e
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat May 7 07:54:12 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> rust-bootstrap: allow run on OS X Lion
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The OS X Lion libSystem does not provide ___muloti4, so get it from
</span><span style='display:block; white-space:pre;color:#404040;'> the compiler runtime library.
</span>---
_resources/port1.0/group/rust-1.0.tcl | 50 +++++++++++++++++------------------
lang/rust-bootstrap/Portfile | 8 ++++--
2 files changed, 31 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/rust-1.0.tcl b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 178d0844ab5..1424add5da7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/rust-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,7 +163,7 @@ proc rust.add_bootstrap_components {architectures {components {rust-std rustc ca
</span> } else {
set build_vendor macports
if { ${os.major} >= 11 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set rustc_version ${version_m1}+0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rustc_version ${version_m1}+1
</span> set build_major ""
} elseif { ${os.major} >= 10 } {
set rustc_version ${version_m1}+0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,30 +251,30 @@ proc rust.add_bootstrap_components {architectures {components {rust-std rustc ca
</span> size 5906007
# MacPorts bootstrap binaries for older system
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums-append rust-std-${version_m1}+0-x86_64-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 c8e3e8064ecc3d774adb146ac65830012315acdb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f9bd87e6a477f5f567c2f9597325d2fb52a964a9a8179dc1a8198cf13e313ebf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 34738214 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rustc-${version_m1}+0-x86_64-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 203231b59c7cea7a95f10f3319e87da735c2bdeb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 18a00c4bc645d0832bd78e9442245215e446a892bd7b369cb999881897c817ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 45347641 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cargo-${version_m1}+0-x86_64-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9b9cba21749a7e1515f712f6f67c706a09d1fee4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a485a4b94dd7699b3f74d9709c3450ee6b08281298b2ab184b425be6a4c2f2b8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5537537 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rust-std-${version_m1}+0-i686-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 22f42744171e07871b46e17a2a6a486729e5eb6f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5d5ef6d5ac1a3c5c728b1d1eba59b0d7ef9718f71be74627b9d3d0cf15a5e374 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 34331493 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rustc-${version_m1}+0-i686-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 93753657c916afac1797c3f01c9144472d9003f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1fcf4ff6d2ed775077b5576ff8c38aa1414d97f1bcdf78b15dcd1b2483dbca2d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 54914579 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cargo-${version_m1}+0-i686-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d8c2311ecf905aacb67b2a8e7b6f57a73a36cd56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5e93c530e8de37cc2196eac4ed881e0b1ca2d3750dea9a0eae55dd7e822dd3d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5549393 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums-append rust-std-${version_m1}+1-x86_64-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1012253985d0874f03b73e68bd5ed3f670d19b48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9523e1b8f41716c332fee71b21d6246a38d04601676496a4b90d150db2e80262 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 34743749 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rustc-${version_m1}+1-x86_64-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 316bdd5ac3e90d3579bb63476dbcf38b65127887 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2725f410501db48d8a3800b434107272ce472495addfb4e10333268dd3a142f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 45349135 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo-${version_m1}+1-x86_64-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a1deb9bcf4ad5350f2e95619cf56ae64c88b7a90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 605e349444051ecdec591de5803b670c324cad9d461354594f5f2f787aa79333 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5776737 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rust-std-${version_m1}+1-i686-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 acf846e7c8bc55c66d8705cb802fcdc13b02ae04 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e86642ddc28319928d2e4daa6f27d70328db366134e25de347f9201e648cab7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 34337717 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rustc-${version_m1}+1-i686-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8efe84f913f9596a27b7a8cb119221dec9fcf4a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 20b9cca01e08f1a630b40726b142fce3d7bd67cdeac461a58ad0b5d8bbaad1e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 54928831 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo-${version_m1}+1-i686-macports-darwin${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 470e8b657e9e734a2d143aece0cd6f685d933d74 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cf590d37c38c85a18996b982a4301f86f5ea3116bad8f3aa839a5403e1d9ab76 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5796220 \
</span> rust-std-${version_m1}+0-x86_64-macports-darwin10${extract.suffix} \
rmd160 7dcbeed06544fafe639bcd208a22d704291f81c5 \
sha256 9ed0cd8b5cf1eada0e913ffba2fd57acfdfd0c5c12c0e77e9a8c2d65a4aa93e9 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust-bootstrap/Portfile b/lang/rust-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 04b1818401d..9b41d2cb4c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ name rust-bootstrap
</span> set version_current 1.60.0
set version_m1 1.59.0
version ${version_m1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name} { revision 0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name} { revision 1 }
</span> subport ${name}-10.6 { revision 0 }
subport ${name}-10.5 { revision 0 }
#subport ${name}-10.4 { revision 0 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +126,11 @@ configure.cmd ${configure.python} src/bootstrap/configure.py
</span> if { ${os.platform} eq "darwin" && [vercmp ${macosx_deployment_target} 10.7] < 0 } {
# Apple Clang does not use emulated thread-local-storage on older systems
compiler.blacklist-append clang
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ___emutls_get_address
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && [vercmp ${macosx_deployment_target} 10.8] < 0 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ___emutls_get_address and ___muloti4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/rust-lang/rust/commit/8a6ff90a3a41e6ace18aeb089ea0a0eb3726dd08
</span> rust.add_compiler_runtime yes
}
</pre><pre style='margin:0'>
</pre>