<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/6ff5b6f54fb0b523c8baaff6f7bdc5dd15e5bb5d">https://github.com/macports/macports-ports/commit/6ff5b6f54fb0b523c8baaff6f7bdc5dd15e5bb5d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6ff5b6f54fb0b523c8baaff6f7bdc5dd15e5bb5d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Apr 13 12:36:22 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> cargo PG: use rust PG
</span>---
_resources/port1.0/group/cargo-1.0.tcl | 37 ++++++++--------------------------
1 file changed, 8 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cargo-1.0.tcl b/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 762114618f9..d34b5c12291 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cargo-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,46 +14,25 @@
</span> # See the cargo_fetch PortGroup for more options
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup rust 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default universal_variant yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default universal_variant yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.cmd {${cargo.bin} build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args --release --frozen -v -j${build.jobs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${configure.build_arch} eq "arm64" && ${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.pre_args-append --target="aarch64-apple-darwin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Enforce same compiler settings as used by rust
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.cmd {${cargo.bin} build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.target {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.pre_args {--release ${cargo.offline_cmd} -v -j${build.jobs}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default build.args {}
</span>
destroot {
ui_error "No destroot phase in the Portfile!"
ui_msg "Here is an example destroot phase:"
ui_msg
ui_msg "destroot {"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg { xinstall -m 0755 ${worksrcpath}/target/[cargo.rust_platform]/release/${name} ${destroot}${prefix}/bin/}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg { xinstall -m 0755 ${worksrcpath}/target/[option triplet.${muniversal.build_arch}]/release/${name} ${destroot}${prefix}/bin/}
</span> ui_msg { xinstall -m 0444 ${worksrcpath}/doc/${name}.1 ${destroot}${prefix}/share/man/man1/}
ui_msg "}"
ui_msg
ui_msg "Please check if there are additional files (configuration, documentation, etc.) that need to be installed."
error "destroot phase not implemented"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/64088
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# rust/cargo builds are often a pain to get them to use the correct
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiler as per MacPorts' selection. So use prepending to PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# trick to ensure 'clang' and 'clang++' point to the correct compilers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set TmpCompPath ${worksrcpath}/cargo_pg/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${TmpCompPath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append PATH=${TmpCompPath}:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append PATH=${TmpCompPath}:$env(PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${configure.cxx} ${TmpCompPath}/clang++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${configure.cc} ${TmpCompPath}/clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span></pre><pre style='margin:0'>
</pre>