[macports-base] branch master updated: portbuild: Pass -j for parallel builds to cargo

[Jeremy Huddleston Sequoia]

This causes cargo to fail to build with -j being unrecognized.

--->  Building cargo
Executing:  cd "/opt/local/var/macports/build/_Users_jeremy_src_macports_macports-ports_devel_cargo/cargo/work/cargo-0.25.0" && /opt/local/var/macports/build/_Users_jeremy_src_macports_macports-ports_devel_cargo/cargo/work/cargo-0.24.0-x86_64-apple-darwin/cargo/bin/cargo -j4 --release -j4 
error: Unknown flag: '-j'

Usage:
    cargo <command> [<args>...]
    cargo [options]
Command failed:  cd "/opt/local/var/macports/build/_Users_jeremy_src_macports_macports-ports_devel_cargo/cargo/work/cargo-0.25.0" && /opt/local/var/macports/build/_Users_jeremy_src_macports_macports-ports_devel_cargo/cargo/work/cargo-0.24.0-x86_64-apple-darwin/cargo/bin/cargo -j4 --release -j4 


> On Mar 26, 2018, at 11:51 PM, Rainer Müller <raimue at macports.org> wrote:
> 
> Rainer Müller (raimue) pushed a commit to branch master
> in repository macports-base.
> 
> https://github.com/macports/macports-base/commit/d1271bcdd33efd3a64d62cdc9aa35acc9a06cad0 <https://github.com/macports/macports-base/commit/d1271bcdd33efd3a64d62cdc9aa35acc9a06cad0>
> The following commit(s) were added to refs/heads/master by this push:
>      new d1271bc  portbuild: Pass -j for parallel builds to cargo
> d1271bc is described below
> 
> commit d1271bcdd33efd3a64d62cdc9aa35acc9a06cad0
> Author: Rainer Müller <raimue at macports.org>
> AuthorDate: Tue Mar 27 08:50:41 2018 +0200
> 
>     portbuild: Pass -j for parallel builds to cargo
>     
>     cargo defaults to building in parallel, but this will respect
>     buildmakejobs set in macports.conf
> ---
>  src/port1.0/portbuild.tcl | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/src/port1.0/portbuild.tcl b/src/port1.0/portbuild.tcl
> index a8b84ea..1d2048f 100644
> --- a/src/port1.0/portbuild.tcl
> +++ b/src/port1.0/portbuild.tcl
> @@ -173,7 +173,11 @@ proc portbuild::build_getjobsarg {args} {
>          return ""
>      }
>  
> -    if {![exists build.jobs] || !([string match "*make*" [option build.cmd]] || [string match "*ninja*" [option build.cmd]] || [string match "*scons*" [option build.cmd]])} {
> +    if {![exists build.jobs] || \
> +            !([string match "*make*" [option build.cmd]] || \
> +              [string match "*ninja*" [option build.cmd]] || \
> +              [string match "*scons*" [option build.cmd]] || \
> +              [string match "*cargo*" [option build.cmd]])} {
>          return ""
>      }
>      set jobs [option build.jobs]
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-dev/attachments/20180402/33cd9f0c/attachment-0001.html>