Skip to content

Commit

Permalink
Merge pull request #3100 from branfosj/20240128171659_new_pr_boost
Browse files Browse the repository at this point in the history
replace `run_cmd` with `run_shell_cmd` in custom easyblock for Boost (`boost.py`)
  • Loading branch information
boegel authored Jan 29, 2024
2 parents 2d50f44 + 3e15dac commit 5f075bb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions easybuild/easyblocks/b/boost.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
from easybuild.tools.config import ERROR
from easybuild.tools.filetools import apply_regex_substitutions, read_file, symlink, which, write_file
from easybuild.tools.modules import get_software_root, get_software_version
from easybuild.tools.run import run_cmd
from easybuild.tools.run import run_shell_cmd
from easybuild.tools.systemtools import AARCH64, POWER, UNKNOWN
from easybuild.tools.systemtools import get_cpu_architecture, get_glibc_version, get_shared_lib_ext

Expand Down Expand Up @@ -144,7 +144,7 @@ def configure_step(self):

cmd = "%s ./bootstrap.sh --with-toolset=%s --prefix=%s %s"
tup = (self.cfg['preconfigopts'], toolset, self.installdir, self.cfg['configopts'])
run_cmd(cmd % tup, log_all=True, simple=True)
run_shell_cmd(cmd % tup)

# Use build_toolset if specified or the bootstrap toolset without the OS suffix
self.toolset = self.cfg['build_toolset'] or re.sub('-linux$', '', toolset)
Expand Down Expand Up @@ -282,7 +282,7 @@ def build_step(self):
self.paracmd,
self.cfg['buildopts'],
])
run_cmd(cmd, log_all=True, simple=True)
run_shell_cmd(cmd)

def install_step(self):
"""Install Boost by copying files to install dir."""
Expand All @@ -298,7 +298,7 @@ def install_step(self):
self.paracmd,
self.cfg['installopts'],
])
run_cmd(cmd, log_all=True, simple=True)
run_shell_cmd(cmd)

if self.cfg['tagged_layout']:
if LooseVersion(self.version) >= LooseVersion("1.69.0") or not self.cfg['single_threaded']:
Expand Down

0 comments on commit 5f075bb

Please sign in to comment.