<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0985b9955993e96a292110639dccbce2a5c78822">https://github.com/macports/macports-ports/commit/0985b9955993e96a292110639dccbce2a5c78822</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0985b9955993e96a292110639dccbce2a5c78822
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu May 9 06:13:04 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> rust*: whitespace changes & prefer `list` to string
</span>---
lang/rust-bootstrap/Portfile | 9 ++++-----
lang/rust/Portfile | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
<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 50d22f48b7a..11ebef01a9a 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;'>@@ -43,7 +43,7 @@ long_description Rust is a curly-brace, block-structured expression \
</span>
homepage https://www.rust-lang.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} in "${name} ${name}-transition" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} in [list ${name} ${name}-transition] } {
</span> # default macosx_deployment_target value of Rust function macos_default_deployment_target
# see https://github.com/rust-lang/rust/blob/master/compiler/rustc_target/src/spec/base/apple/mod.rs
macosx_deployment_target [expr {${configure.build_arch} eq "arm64" ? 11.0 : 10.12}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,8 +218,7 @@ foreach arch ${muniversal.architectures} {
</span> configure.args.${arch}-append \
--set=build.rustc=${rustc_prefix}/rustc/bin/rustc \
--set=build.cargo=${cargo_prefix}/cargo/bin/cargo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --set=target.${platform}.cc=[compwrap::wrap_compiler cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --set=target.${platform}.cc=[compwrap::wrap_compiler cc] \
</span> --set=target.${platform}.cxx=[compwrap::wrap_compiler cxx] \
--set=target.${platform}.linker=[compwrap::wrap_compiler ld] \
--set=target.${platform}.ar=${rust_build.archiver} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -236,10 +235,10 @@ set llvm_targets [list]
</span> if { ${configure.build_arch} eq "arm64" || "arm64" in ${muniversal.architectures} } {
lappend llvm_targets "AArch64"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${configure.build_arch} in "x86_64 i386" || "x86_64" in ${muniversal.architectures} || "i386" in ${muniversal.architectures} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${configure.build_arch} in [list x86_64 i386] || "x86_64" in ${muniversal.architectures} || "i386" in ${muniversal.architectures} } {
</span> lappend llvm_targets "X86"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${configure.build_arch} in "ppc ppc64" || "ppc" in ${muniversal.architectures} || "ppc64" in ${muniversal.architectures} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${configure.build_arch} in [list ppc ppc64] || "ppc" in ${muniversal.architectures} || "ppc64" in ${muniversal.architectures} } {
</span> # likely will never work
# see https://discourse.llvm.org/t/want-to-add-powerpc-apple-darwin-as-target-what-is-involved/4536
lappend llvm_targets "PowerPC"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/rust/Portfile b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 084ccfced13..7ed9ce4c7d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/rust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -211,8 +211,7 @@ foreach arch ${muniversal.architectures} {
</span> configure.args.${arch}-append \
--set=build.rustc=${rustc_prefix}/rustc/bin/rustc \
--set=build.cargo=${cargo_prefix}/cargo/bin/cargo
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --set=target.${platform}.cc=[compwrap::wrap_compiler cc] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --set=target.${platform}.cc=[compwrap::wrap_compiler cc] \
</span> --set=target.${platform}.cxx=[compwrap::wrap_compiler cxx] \
--set=target.${platform}.linker=[compwrap::wrap_compiler ld] \
--set=target.${platform}.ar=${rust_build.archiver} \
</pre><pre style='margin:0'>
</pre>