summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--var/spack/repos/builtin/packages/bowtie/package.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/bowtie/package.py b/var/spack/repos/builtin/packages/bowtie/package.py
index 3d3bf619a5..50c02c9825 100644
--- a/var/spack/repos/builtin/packages/bowtie/package.py
+++ b/var/spack/repos/builtin/packages/bowtie/package.py
@@ -13,6 +13,7 @@ class Bowtie(MakefilePackage):
homepage = "https://sourceforge.net/projects/bowtie-bio/"
url = "https://github.com/BenLangmead/bowtie/archive/v1.2.0.tar.gz"
+ version('1.2.3', sha256='86402114caeacbb3a3030509cb59f0b7e96361c7b3ee2dd50e2cd68200898823')
# The bowtie project git tagged and GitHub released a v1.2.2,
# discovered/fixed a bug, git tagged a v1.2.2_p1 and moved the
# 1.2.2 release to use it rather than making a new `1.2.2_p1`
@@ -29,11 +30,10 @@ class Bowtie(MakefilePackage):
# clearly identical to 1.2.0.
version('1.2', md5='6d97f0ea1a65af11d17cc270cfac4af9', url='https://downloads.sourceforge.net/project/bowtie-bio/bowtie/1.2.0/bowtie-1.2-source.zip')
- # Feel free to tighten this. I know that v1.2.2 (aka v1.2.2_p1)
- # builds with %gcc@5.5.5 and fails to build with %gcc@8.2.0. I'm
- # not sure whether or not it works with other versions in the
- # interval.
- conflicts('%gcc@8:', when='@1.2.2:')
+ # 1.2.2 and 1.2.2_p1 fail to build with %gcc@8.3.0
+ # with and without issue-87 patch
+ conflicts('%gcc@8:', when='@1.2.2')
+ conflicts('%gcc@8:', when='@1.2.2_p1')
variant('tbb', default=False, description='Use Intel thread building block')
@@ -43,7 +43,7 @@ class Bowtie(MakefilePackage):
# See: https://github.com/BenLangmead/bowtie/issues/87, a
# different fix is in the FreeBSD ports/package tree
# https://svnweb.freebsd.org/ports?view=revision&revision=483954
- patch('issue-87.patch', when='%gcc@8.0.0:')
+ patch('issue-87.patch', when='@:1.2.2 %gcc@8.0.0:')
def edit(self, spec, prefix):
makefile = FileFilter('Makefile')