summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/bowtie2/bowtie2-2.3.1.patch3
-rw-r--r--var/spack/repos/builtin/packages/bowtie2/package.py5
2 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/bowtie2/bowtie2-2.3.1.patch b/var/spack/repos/builtin/packages/bowtie2/bowtie2-2.3.1.patch
index 0f4a15b1a1..006ebccb9e 100644
--- a/var/spack/repos/builtin/packages/bowtie2/bowtie2-2.3.1.patch
+++ b/var/spack/repos/builtin/packages/bowtie2/bowtie2-2.3.1.patch
@@ -3,7 +3,8 @@
@@ -26,10 +26,10 @@
INC =
- LIBS = -lreadline -ltermcap -lz
+-LIBS = -lreadline -ltermcap -lz
++LIBS = -lreadline -lz
-GCC_PREFIX = $(shell dirname `which gcc`)
+GCC_PREFIX =
GCC_SUFFIX =
diff --git a/var/spack/repos/builtin/packages/bowtie2/package.py b/var/spack/repos/builtin/packages/bowtie2/package.py
index dc850d817f..8d541b15c3 100644
--- a/var/spack/repos/builtin/packages/bowtie2/package.py
+++ b/var/spack/repos/builtin/packages/bowtie2/package.py
@@ -37,10 +37,15 @@ class Bowtie2(Package):
version('2.2.5', '51fa97a862d248d7ee660efc1147c75f')
depends_on('tbb', when='@2.3.1')
+ depends_on('readline')
+ depends_on('zlib')
patch('bowtie2-2.2.5.patch', when='@2.2.5', level=0)
patch('bowtie2-2.3.1.patch', when='@2.3.1', level=0)
+ # seems to have trouble with 6's -std=gnu++14
+ conflicts('%gcc@6:')
+
def install(self, spec, prefix):
make()
mkdirp(prefix.bin)