summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/bowtie2/package.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py
index c87c404dd0..df24b34ff1 100644
--- a/var/spack/repos/builtin/packages/bowtie2/package.py
+++ b/var/spack/repos/builtin/packages/bowtie2/package.py
@@ -33,6 +33,7 @@ class Bowtie2(MakefilePackage):
# seems to have trouble with 6's -std=gnu++14
conflicts('%gcc@6:', when='@:2.3.1')
+ conflicts('^intel-oneapi-tbb', when='@:2.3.5.1')
conflicts('@:2.3.5.0', when='target=aarch64:')
conflicts('@2.4.1', when='target=aarch64:')
@@ -45,7 +46,7 @@ class Bowtie2(MakefilePackage):
files = ['bowtie2', ]
filter_file(match, substitute, *files, **kwargs)
- match = '^#!/usr/bin/env python'
+ match = '^#!/usr/bin/env python.*'
python = spec['python'].command
substitute = "#!{python}".format(python=python)
files = ['bowtie2-build', 'bowtie2-inspect']