Ticket #12280: macports-makejobs.patch

doc/macports.conf.in

@@ -40 +46 @@
 # Supported types: tgz (default), tar, tbz, tbz2, xar, zip, cpgz, cpio
 portarchivetype         tgz
 
+# Number of simultaneous make jobs (commands) to use when building ports
+buildmakejobs           1
+
 # Set whether to automatically execute "clean" after "install" of ports
 portautoclean           yes
 

src/macports1.0/macports.tcl

@@ -43 +43 @@
         portinstalltype portarchivemode portarchivepath portarchivetype portautoclean \
         porttrace portverbose destroot_umask variants_conf rsync_server rsync_options \
         rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \
-        mp_remote_url mp_remote_submit_url"
+        mp_remote_url mp_remote_submit_url buildmakejobs"
     variable user_options "submitter_name submitter_email submitter_key"
     variable portinterp_options "\
         portdbpath portpath portbuildpath auto_path prefix prefix_frozen portsharepath \
         registry.path registry.format registry.installtype portarchivemode portarchivepath \
         portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server \
         rsync_options rsync_dir startupitem_type place_worksymlink \
-        mp_remote_url mp_remote_submit_url \
+        mp_remote_url mp_remote_submit_url buildmakejobs \
         $user_options"
     
     # deferred options are only computed when needed.
@@ -286 +286 @@
         global macports::variants_conf
         global macports::xcodebuildcmd
         global macports::xcodeversion
+        global macports::buildmakejobs
 
         # Set the system encoding to utf-8
         encoding system utf-8

src/port1.0/portbuild.tcl

@@ -40 +40 @@
 
 # define options
 options build.target
+options build.jobs
+options build.max_jobs
 commands build
 # defaults
 default build.dir {${workpath}/${worksrcdir}}
-default build.cmd {[build_getmaketype]}
+default build.cmd {[build_getmaketype][build_getmakejobs]}
+default build.jobs {${buildmakejobs}}
 default build.pre_args {${build.target}}
 default build.target "all"
 
@@ -91 +93 @@
     }
 }
 
+proc build_getmakejobs {args} {
+    if {![exists build.jobs]} {
+       return ""
+    }
+    set jobs [option build.jobs]
+    if {$jobs == 1} {
+       return ""
+    }
+    if {[exists build.max_jobs]} {
+       if {$jobs > [option build.max_jobs]} {
+           set jobs [option build.max_jobs]
+       }
+    }
+    return " -j$jobs"
+}
+
 proc build_start {args} {
     global UI_PREFIX