summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGlenn Johnson <glenn-johnson@uiowa.edu>2021-03-20 03:43:19 -0500
committerGitHub <noreply@github.com>2021-03-20 09:43:19 +0100
commitcbb64156cbe2bb9f0b990a5723bbe4633b4e90b5 (patch)
tree2955c1679b61e61b9062b747cc70d7721d07f7bb /var
parent381da114f0b1e8d0f9ae8029959a6817e0f90193 (diff)
downloadspack-cbb64156cbe2bb9f0b990a5723bbe4633b4e90b5.tar.gz
spack-cbb64156cbe2bb9f0b990a5723bbe4633b4e90b5.tar.bz2
spack-cbb64156cbe2bb9f0b990a5723bbe4633b4e90b5.tar.xz
spack-cbb64156cbe2bb9f0b990a5723bbe4633b4e90b5.zip
bowtie2: fix python interpreter line (#22417)
Beginning with version 2.4.1, the python interpreter line changed from "#!/usr/bin/env python" to "#!/usr/bin/env python3" That caused the bowtie2-build and bowtie2-inspect scripts to have a trailing '3' at the end of the interpreter line. This PR fixes that. I also observed that older versions do not build with intel-oneapi-tbb so added a conflicts statement for that.
Diffstat (limited to 'var')
-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']