Skip to content

Commit

Permalink
add regex that adds a comma between the 'with_*' variables, fix the o…
Browse files Browse the repository at this point in the history
…ther
  • Loading branch information
bedroge committed Oct 29, 2024
1 parent f23d154 commit 82c5098
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions easybuild/easyblocks/s/score_p.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,13 @@ def configure_step(self, *args, **kwargs):
# Let configure scripts specifically check for yes|no instead of *yes*|*no*,
# to prevent errors for certain dependencies installed in a path that includes "yes" or "no"
# see https://gitlab.com/score-p/scorep/-/issues/1008
yes_no_regex = (r'\*yes\*\|\*no\*', r'yes,\*\|no,\*\|\*,yes\|\*,no')
yes_no_regex = [
(r'\*yes\*\|\*no\*', 'yes,*|no,*|*,yes|*,no'),
(r'_lib}\${with_', '_lib},${with_'),
]
configure_scripts = glob.glob(os.path.join(self.start_dir, 'build-*', 'configure'))
for configure_script in configure_scripts:
apply_regex_substitutions(configure_script, [yes_no_regex])
apply_regex_substitutions(configure_script, yes_no_regex)

# Remove some settings from the environment, as they interfere with
# Score-P's configure magic...
Expand Down

0 comments on commit 82c5098

Please sign in to comment.