From 0c12e26026cd8262be6f678da437430c76293e47 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Tue, 2 Dec 2014 14:25:52 -0800
Subject: Bugfix in boost build.

- b2 used to be called bjam
---
 var/spack/packages/boost/package.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'var')

diff --git a/var/spack/packages/boost/package.py b/var/spack/packages/boost/package.py
index d3231c3baa..254d1afda1 100644
--- a/var/spack/packages/boost/package.py
+++ b/var/spack/packages/boost/package.py
@@ -53,7 +53,10 @@ class Boost(Package):
         bootstrap = Executable('./bootstrap.sh')
         bootstrap()
 
-        b2 = Executable('./b2')
+        # b2 used to be called bjam, before 1.47 (sigh)
+        b2name = './b2' if spec.satisfies('@1.47:') else './bjam'
+
+        b2 = Executable(b2name)
         b2('install',
            '-j %s' % make_jobs,
            '--prefix=%s' % prefix)
-- 
cgit v1.2.3-70-g09d2