<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8210552fa55bf9cdeb8a847dde83918b25b857f5">https://github.com/macports/macports-ports/commit/8210552fa55bf9cdeb8a847dde83918b25b857f5</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 8210552fa55 rust-src: put sources in the right place
</span>8210552fa55 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8210552fa55bf9cdeb8a847dde83918b25b857f5
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Dec 7 04:57:23 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> rust-src: put sources in the right place
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Before sources was installed to the wrong place and `cargo build
</span><span style='display:block; white-space:pre;color:#404040;'> --release -Z build-std --target=x86_64-apple-darwin` fails as:
</span><span style='display:block; white-space:pre;color:#404040;'> ```
</span><span style='display:block; white-space:pre;color:#404040;'> error: "/opt/local/lib/rustlib/src/rust/Cargo.lock" does not exist, unable to build with the standard library, try:
</span><span style='display:block; white-space:pre;color:#404040;'> rustup component add rust-src
</span><span style='display:block; white-space:pre;color:#404040;'> ```
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> now it works as expected.
</span>---
lang/rust/Portfile | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 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 26d115ab726..72975f4e22e 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;'>@@ -11,6 +11,7 @@ legacysupport.newest_darwin_requires_legacy 15
</span> # keep in mind that you also need to update cargo.crates at the end of this file
name rust
version 1.57.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# rust-src has increased revision. Keep it in mind
</span> revision 1
if { ${subport} eq ${name} } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,7 +169,7 @@ if {${os.platform} eq "darwin" && ${os.major} < ${min_darwin}} {
</span> set rust_platform ${arch}-apple-${os.platform}
set rust_root ${worksrcpath}/build/stage0-${arch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${subport} ne ${ccwrap} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} ne ${ccwrap} && ${subport} ne "rust-src" } {
</span> if {${os.platform} eq "darwin" && ${os.major} < 13} {
depends_build-append \
port:curl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -376,6 +377,11 @@ livecheck.url https://github.com/rust-lang/rust/tags
</span> livecheck.regex refs/tags/(\[\\d\\.\]+).zip
subport rust-src {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not unpack bootsrap dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles ${distname}${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # remove dependencies
depends_build
depends_lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -387,19 +393,20 @@ subport rust-src {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # delete the test directories (which for some god awful reason contains binaries)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "find src/llvm-project -type d -name test -print0 | xargs -0 rm -rf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build {}
destroot {
xinstall -d ${rust_source_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/src ${rust_source_dir}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/library ${rust_source_dir}/library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${worksrcpath}/*] ${rust_source_dir}
</span>
# correct the permissions
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${rust_source_dir} "find . -type d -exec chmod 755 {} \\;"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${rust_source_dir} "find . -type f -exec chmod 644 {} \\;"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # delete the test directories (which for some god awful reason contains binaries)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${rust_source_dir} "find . -type d -name test -print0 | xargs -0 rm -rf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${rust_source_dir} "find . -type d -perm -755 -print0 | xargs -0 chmod 755"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${rust_source_dir} "find . -type f -perm -644 -print0 | xargs -0 chmod 644"
</span> }
}
</pre><pre style='margin:0'>
</pre>