diff options
| author | George Hartzell <hartzell@alerce.com> | 2017-04-28 12:47:43 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2017-04-28 14:47:43 -0500 |
| commit | 529a2ae5fa19da4323ec714405be81d6fed005b0 (patch) | |
| tree | 0e49e7b859ecd45d0be99fdd918d992e9c55d497 /var | |
| parent | 3f6e03d5c16c8cf0ebf3c6175cb21aaa2d3278c6 (diff) | |
| download | spack-529a2ae5fa19da4323ec714405be81d6fed005b0.tar.gz spack-529a2ae5fa19da4323ec714405be81d6fed005b0.tar.bz2 spack-529a2ae5fa19da4323ec714405be81d6fed005b0.tar.xz spack-529a2ae5fa19da4323ec714405be81d6fed005b0.zip | |
Depend on readline, remove hardcoded -ltermcap (#4042)
* depend on readline, remove hardcoded -ltermcap
Bowtie should use Spack's readline and not explicitly depend on the
system termcap (which, on CentOS, leads to linking against the
system's tinfo library).
* Add depends_on('zlib')
* Add conflict with gcc@6:
Build seems to have trouble with 6's migration to -std=gnu++14.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/bowtie2/bowtie2-2.3.1.patch | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/bowtie2/package.py | 5 |
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) |