<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/6288df7c6da252b334157eb3f2ba10b7f0b4d756">https://github.com/macports/macports-ports/commit/6288df7c6da252b334157eb3f2ba10b7f0b4d756</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6288df7c6da252b334157eb3f2ba10b7f0b4d756
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Feb 17 05:54:13 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> rust, cargo: fix build if prefix is not /opt/local
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts produced bootstrap binaries were built
</span><span style='display:block; white-space:pre;color:#404040;'> with ${prefix} as /opt/local
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span>---
devel/cargo/Portfile | 4 ++++
lang/rust/Portfile | 7 +++++++
2 files changed, 11 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cargo/Portfile b/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4226c020fe9..64f862dc042 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cargo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,10 @@ set cargo_version [rust.add_bootstrap_components ${configure.build_arch} cargo
</span> # Some bootstrap components are mirrored by rust
master_sites-append http://distfiles.macports.org/rust/:macports_vendor
cargo.bin ${workpath}/cargo-${cargo_version}-[option triplet.${configure.build_arch}]/cargo/bin/cargo
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${prefix} ne "/opt/local" && ${configure.build_arch} ni ${rust.upstream_archs}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts produced bootstrap binaries were built with ${prefix} as /opt/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cargo.bin-prepend DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
cargo.update yes
<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 30cc00a3968..94d7e9e8457 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;'>@@ -59,6 +59,13 @@ if {${configure.sdkroot} eq "" && ${os.major} >= 12} {
</span> # see https://github.com/rust-lang/cc-rs/blob/main/src/lib.rs
build.env-append SDKROOT=/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach arch ${muniversal.architectures} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${prefix} ne "/opt/local" && ${arch} ni ${rust.upstream_archs}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacPorts produced bootstrap binaries were built with ${prefix} as /opt/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env.${arch}-append DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env.${arch}-append DYLD_FALLBACK_LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# the downloaded Rust compiler must run on the machine
# since binaries must run anyway, simplify build by using Rosetta and not worry about cross-compiling
</pre><pre style='margin:0'>
</pre>