summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGeorge Hartzell <hartzell@alerce.com>2017-08-06 13:23:13 -0700
committerAdam J. Stewart <ajstewart426@gmail.com>2017-08-06 15:23:13 -0500
commit0bd55cb8ce6350d8049023e4dc2c7cb68a77e443 (patch)
tree7cf31dd653fa4120f616044fe8141a297854c75e /var
parentafc4f9c3c2d464b2e1e25ace359e230fbc24fd6a (diff)
downloadspack-0bd55cb8ce6350d8049023e4dc2c7cb68a77e443.tar.gz
spack-0bd55cb8ce6350d8049023e4dc2c7cb68a77e443.tar.bz2
spack-0bd55cb8ce6350d8049023e4dc2c7cb68a77e443.tar.xz
spack-0bd55cb8ce6350d8049023e4dc2c7cb68a77e443.zip
Limit make_jobs for boost < 1.59 (#4984)
Earlier versions of boost had a fixed maximum number of jobs. 1.54 was 64, it bumped once or twice afterwards and in 1.59 [this commit][commit] it became dynamic. I need 1.54 for as a prereq for bcl2fastq but I can't build 1.54 on my 144 core build box. This fixes that. [commit]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 77538cf000..fc3b967fd1 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -341,7 +341,11 @@ class Boost(Package):
b2name = './b2' if spec.satisfies('@1.47:') else './bjam'
b2 = Executable(b2name)
- b2_options = ['-j', '%s' % make_jobs]
+ jobs = make_jobs
+ # in 1.59 max jobs became dynamic
+ if jobs > 64 and spec.satisfies('@:1.58'):
+ jobs = 64
+ b2_options = ['-j', '%s' % jobs]
threadingOpts = self.determine_b2_options(spec, b2_options)