commit df4a993027b81b49c5576f85faac071dac9bf158 Author: Sukhbir Singh sukhbir@torproject.org Date: Tue Sep 12 10:34:03 2017 -0400

Add num_procs option to rbm.conf

Changes borrowed from tor-browser-build/rbm.conf --- rbm.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf index 19a0c4d..fbcb49e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -6,6 +6,12 @@ build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project %]

pkg_type: build

+# buildconf contains build options that the user can change in rbm.local.conf +# When adding a new option to buildconf, a default value should be defined +# in var/build_id, so that changing this option does not affect the build_id. +buildconf: + num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "8" %]' + var: tormessenger_version: '0.5.0b1' copyright_year: '2017' @@ -17,7 +23,7 @@ var: # in the same order. In the cases where the installation order is # important, sort_deps should be set to 0. sort_deps: 1 - build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]' + build_id: '[% sha256(c("var/build_id_txt", { buildconf => { num_procs => 8 } })).substr(0, 6) %]' build_id_txt: | [% c("version") %] [% IF c("git_hash") || c("hg_hash"); GET c("abbrev"); END; %]