<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7f163dbadf854337f66ab628c0c3472cda8d7e82">https://github.com/macports/macports-ports/commit/7f163dbadf854337f66ab628c0c3472cda8d7e82</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7f163dbadf854337f66ab628c0c3472cda8d7e82
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Wed Apr 28 17:54:39 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> rust: add coreutils as build dep on older systems
</span>---
lang/rust/Portfile | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
<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 11544ecfc77..7fecd16fe03 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;'>@@ -46,6 +46,9 @@ post-extract {
</span> ln -s ${prefix}/bin/python${py_ver} ${workpath}/bin/python3
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Collect paths to add to PATH env var
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set NewPath "${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set arch ${configure.build_arch}
if {${configure.build_arch} eq "arm64"} {
set arch "aarch64"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +64,7 @@ set ccwrap ${name}-compiler-wrap
</span> if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] && ${subport} ne ${ccwrap} } {
# Force use of MP clang
compiler.blacklist-append clang
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Relink downloaded binaries
</span> post-extract {
ui_debug "Relinking rust/cargo bootstrap binaries"
# Re-link binaries to force loading of MacPorts LegacySupport lib instead of libSystem
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +89,9 @@ if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] && ${su
</span> relink_binaries [ exec find ${workpath}/ -name "*.dylib" ]
search_dirs_relink [ exec find ${workpath}/ -type d -and -name bin -or -name libexec ]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Need a newer set of coreutils (e.g. mktemp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:coreutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set NewPath "${prefix}/libexec/gnubin:${NewPath}"
</span> }
if { ${subport} ne ${ccwrap} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,10 +267,9 @@ if { ${subport} ne ${ccwrap} } {
</span> configure.objc ${wrapdir}/clang
configure.objcxx ${wrapdir}/clang++
set ld ${wrapdir}/ld-rust
<span style='display:block; white-space:pre;background:#ffe0e0;'>- envs_append "PATH=${wrapdir}:${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- envs_append "PATH=${workpath}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set NewPath "${wrapdir}:${NewPath}"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ envs_append "PATH=${NewPath}"
</span> }
envs_append LD=${ld}
</pre><pre style='margin:0'>
</pre>