zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Depend on readline, remove hardcoded -ltermcap (#4042)

Browse Source 
* 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.
This commit is contained in:
George Hartzell 2017-04-28 12:47:43 -07:00 committed by Adam J. Stewart
parent 3f6e03d5c1
commit 529a2ae5fa
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/bowtie2/bowtie2-2.3.1.patch
View File

@ -3,7 +3,8 @@
@@ -26,10 +26,10 @@ @@ -26,10 +26,10 @@
INC = INC =
LIBS = -lreadline -ltermcap -lz -LIBS = -lreadline -ltermcap -lz
+LIBS = -lreadline -lz
-GCC_PREFIX = $(shell dirname `which gcc`) -GCC_PREFIX = $(shell dirname `which gcc`)
+GCC_PREFIX = +GCC_PREFIX =
GCC_SUFFIX = GCC_SUFFIX =

5
var/spack/repos/builtin/packages/bowtie2/package.py
View File

@ -37,10 +37,15 @@ class Bowtie2(Package):
version('2.2.5', '51fa97a862d248d7ee660efc1147c75f') version('2.2.5', '51fa97a862d248d7ee660efc1147c75f')
depends_on('tbb', when='@2.3.1') 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.2.5.patch', when='@2.2.5', level=0)
patch('bowtie2-2.3.1.patch', when='@2.3.1', 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): def install(self, spec, prefix):
make() make()
mkdirp(prefix.bin) mkdirp(prefix.bin)