<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/b98b7f18954db8ae630730b1429878dae07f3002">https://github.com/macports/macports-base/commit/b98b7f18954db8ae630730b1429878dae07f3002</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 b98b7f189 Obey buildmakejobs in selfupdate
</span>b98b7f189 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b98b7f18954db8ae630730b1429878dae07f3002
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Sep 25 16:48:31 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Obey buildmakejobs in selfupdate
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56435
</span>---
src/macports1.0/selfupdate.tcl | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/selfupdate.tcl b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 347b71091..4400783cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> global macports::prefix macports::portdbpath macports::rsync_server macports::rsync_dir \
macports::rsync_options macports::autoconf::macports_version \
macports::autoconf::rsync_path tcl_platform macports::autoconf::openssl_path \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macports::autoconf::tar_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports::autoconf::tar_path macports::buildmakejobs
</span> array set options $optionslist
# variable that indicates whether we actually updated base
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,8 +189,18 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> # Choose a sane compiler and SDK
set cc_arg {}
set sdk_arg {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$buildmakejobs != 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jobs ${buildmakejobs}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {$::macports::os_platform eq "darwin"} {
set cc_arg "CC=/usr/bin/cc "
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$buildmakejobs == 0 && ![catch {sysctl hw.activecpu} cpus]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jobs $cpus
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {sysctl hw.memsize} memsize]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && $jobs > $memsize / (1024 * 1024 * 1024) + 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jobs [expr {$memsize / (1024 * 1024 * 1024) + 1}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {$::macports::os_major >= 18 || ![file exists /usr/include/sys/cdefs.h]} {
set cltpath /Library/Developer/CommandLineTools
set sdk_version $::macports::macos_version_major
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,12 +224,15 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$buildmakejobs == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # non-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jobs 2
</span> }
# do the actual configure, build and installation of new base
ui_msg "Installing new MacPorts release in $prefix as ${owner}:${group}; permissions ${perms}\n"
try {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W $mp_source_path "${cc_arg}${sdk_arg}./configure $configure_args && ${sdk_arg}make SELFUPDATING=1 && make install SELFUPDATING=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W $mp_source_path "${cc_arg}${sdk_arg}./configure $configure_args && ${sdk_arg}make -j${jobs} SELFUPDATING=1 && make install SELFUPDATING=1"
</span> } on error {eMessage} {
error "Error installing new MacPorts base: $eMessage"
}
</pre><pre style='margin:0'>
</pre>