<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/564c146af7cdc9f3be0152204367ab60ed208129">https://github.com/macports/macports-base/commit/564c146af7cdc9f3be0152204367ab60ed208129</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 564c146af Factor out evaluation of buildmakejobs for selfupdate
</span>564c146af is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 564c146af7cdc9f3be0152204367ab60ed208129
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 30 00:08:56 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> Factor out evaluation of buildmakejobs for selfupdate
</span>---
src/macports1.0/macports.tcl | 18 ++++++++++++++++++
src/macports1.0/selfupdate.tcl | 15 ++-------------
2 files changed, 20 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 743bd2fa8..932717464 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5835,3 +5835,21 @@ proc macports::shellescape {arg} {
</span> proc macports::unobscure_maintainers {list} {
return [macports_util::unobscure_maintainers $list]
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Get actual number of parallel jobs based on buildmakejobs, which may
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# be 0 for automatic selection.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc macports:get_parallel_jobs {{mem_restrict yes}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string is integer -strict $::macports::buildmakejobs] && $::macports::buildmakejobs > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jobs $::macports::buildmakejobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {$::macports::os_platform eq "darwin" && $::macports::buildmakejobs == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![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 {$mem_restrict && ![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;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jobs 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $jobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><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 74ac8db70..8932ff341 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 macports::buildmakejobs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports::autoconf::tar_path
</span> array set options $optionslist
# variable that indicates whether we actually updated base
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,20 +191,9 @@ 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:#ffe0e0;'>- if {$buildmakejobs != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jobs ${buildmakejobs}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jobs 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set jobs [macports:get_parallel_jobs yes]
</span> if {$::macports::os_platform eq "darwin"} {
set cc_arg "CC=/usr/bin/cc "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$buildmakejobs == 0 && ![catch {sysctl hw.activecpu} cpus]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jobs $cpus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {sysctl hw.memsize} memsize]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && $jobs > $memsize / (1024 * 1024 * 1024) + 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set jobs [expr {$memsize / (1024 * 1024 * 1024) + 1}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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
</pre><pre style='margin:0'>
</pre>