<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/c9b6181dcd433710cdd18f548e899a2da1b6b7cb">https://github.com/macports/macports-base/commit/c9b6181dcd433710cdd18f548e899a2da1b6b7cb</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 c9b6181 Revert "portbuild: Pass -j for parallel builds to cargo"
</span>c9b6181 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c9b6181dcd433710cdd18f548e899a2da1b6b7cb
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Apr 2 22:42:56 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> Revert "portbuild: Pass -j for parallel builds to cargo"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The -jX argument is only valid after the sub-command, for example
</span><span style='display:block; white-space:pre;color:#404040;'> 'cargo build -j4', but 'cargo -j4' is invalid. We do not know the way
</span><span style='display:block; white-space:pre;color:#404040;'> the build.* options are set up in the Portfile, therefore this method
</span><span style='display:block; white-space:pre;color:#404040;'> is not reliable.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit d1271bcdd33efd3a64d62cdc9aa35acc9a06cad0.
</span>---
src/port1.0/portbuild.tcl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portbuild.tcl b/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d2048f..38e1f6c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portbuild.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,8 +176,7 @@ proc portbuild::build_getjobsarg {args} {
</span> if {![exists build.jobs] || \
!([string match "*make*" [option build.cmd]] || \
[string match "*ninja*" [option build.cmd]] || \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- [string match "*scons*" [option build.cmd]] || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [string match "*cargo*" [option build.cmd]])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [string match "*scons*" [option build.cmd]])} {
</span> return ""
}
set jobs [option build.jobs]
</pre><pre style='margin:0'>
</pre>