Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix Boost easyblock for versions >=1.71.0 #1814

Merged
merged 2 commits into from
Sep 27, 2019
Merged

fix Boost easyblock for versions >=1.71.0 #1814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa78e79
fix boost easyblock for versions >=1.71.0
Sep 24, 2019
e53e625
move bjamcmd to constructor
Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions easybuild/easyblocks/b/boost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ def __init__(self, *args, **kwargs):

self.pyvers = []

if LooseVersion(self.version) >= LooseVersion("1.71.0"):
self.bjamcmd = 'b2'
else:
self.bjamcmd = 'bjam'

@staticmethod
def extra_options():
"""Add extra easyconfig parameters for Boost."""
Expand Down Expand Up @@ -170,13 +175,14 @@ def configure_step(self):
def build_boost_variant(self, bjamoptions, paracmd):
"""Build Boost library with specified options for bjam."""
# build with specified options
cmd = "%s ./bjam %s %s %s" % (self.cfg['prebuildopts'], bjamoptions, paracmd, self.cfg['buildopts'])
cmd = "%s ./%s %s %s %s" % (self.cfg['prebuildopts'], self.bjamcmd, bjamoptions, paracmd, self.cfg['buildopts'])
run_cmd(cmd, log_all=True, simple=True)
# install built Boost library
cmd = "%s ./bjam %s install %s %s" % (self.cfg['preinstallopts'], bjamoptions, paracmd, self.cfg['installopts'])
cmd = "%s ./%s %s install %s %s" % (
self.cfg['preinstallopts'], self.bjamcmd, bjamoptions, paracmd, self.cfg['installopts'])
run_cmd(cmd, log_all=True, simple=True)
# clean up before proceeding with next build
run_cmd("./bjam --clean-all", log_all=True, simple=True)
run_cmd("./%s --clean-all" % self.bjamcmd, log_all=True, simple=True)

def build_step(self):
"""Build Boost with bjam tool."""
Expand Down Expand Up @@ -231,7 +237,8 @@ def build_step(self):
# install remainder of boost libraries
self.log.info("Installing boost libraries")

cmd = "%s ./bjam %s install %s %s" % (self.cfg['preinstallopts'], bjamoptions, paracmd, self.cfg['installopts'])
cmd = "%s ./%s %s install %s %s" % (
self.cfg['preinstallopts'], self.bjamcmd, bjamoptions, paracmd, self.cfg['installopts'])
run_cmd(cmd, log_all=True, simple=True)

def install_step(self):
Expand Down