<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/ab5c006fb4dc9bdf81be0516bf43bf6254f92f0b">https://github.com/macports/macports-ports/commit/ab5c006fb4dc9bdf81be0516bf43bf6254f92f0b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ab5c006fb4dc9bdf81be0516bf43bf6254f92f0b
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Apr 27 14:14:47 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> cargo PG: make default configure & build the default
</span>---
_resources/port1.0/group/cargo-1.0.tcl | 29 +++++++++++++++++++----------
devel/mesalink/Portfile | 5 -----
textproc/ripgrep/Portfile | 2 ++
3 files changed, 21 insertions(+), 15 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 610d277..a0d3e79 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;'>@@ -62,12 +62,13 @@
</span> # baz author/baz branch abcdef12345678...commit...abcdef12345678 fedcba654321...
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options cargo.home cargo.crates cargo.crates_github
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options cargo.home cargo.crates cargo.crates_github cargo.direct_call
</span>
default cargo.home {${workpath}/.home/.cargo}
default cargo.crates {}
default cargo.crates_github {}
default universal_variant yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default cargo.direct_call no
</span>
option_proc cargo.crates handle_cargo_crates
proc handle_cargo_crates {option action {value ""}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,6 +109,23 @@ proc handle_cargo_crates_github {option action {value ""}} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+option_proc cargo.direct_call handle_cargo_direct_call
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc handle_cargo_direct_call {option action {value ""}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${action} eq "set" && ${value}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global build.jobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd cargo build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.pre_args --release --frozen -v -j${build.jobs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # restore destroot.cmd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default destroot.cmd {[portbuild::build_getmaketype]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # MacPorts use the name i386 for 32-bit Intel architecture
# Cargo and Rust use the name i686
proc cargo.translate_arch_name {arch} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,13 +331,4 @@ proc universal_setup {args} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd cargo 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> build.env-append RUSTFLAGS="-C linker=${configure.cc}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# restore destroot.cmd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default destroot.cmd {[portbuild::build_getmaketype]}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mesalink/Portfile b/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b752cb7..4d59505 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,11 +80,6 @@ use_configure yes
</span>
configure.args-append --enable-rusthost=\$CARGO_BUILD_TARGET
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Release 0.6.1 is broken as it does not contain Cargo.lock
# https://github.com/mesalock-linux/mesalink/issues/10
livecheck.version 0.6.1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/ripgrep/Portfile b/textproc/ripgrep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dbba25..95a9b9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/ripgrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/ripgrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,6 +67,8 @@ depends_build-append \
</span> port:asciidoc \
port:docbook-xsl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+cargo.direct_call yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # muniversal build requires Makefile
# OUTDIR contains a checksum, so it is not know until late in the build process and may
# change with a change in the cargo PortGroup
</pre><pre style='margin:0'>
</pre>