diff options
| author | Levi Baber <baberlevi@gmail.com> | 2018-03-09 18:05:39 -0600 |
|---|---|---|
| committer | becker33 <becker33@llnl.gov> | 2018-03-09 16:05:39 -0800 |
| commit | 3945b2adb418e2b37c6785a1a7472f1711156bf0 (patch) | |
| tree | 43baafdba1a1c293395a71671d297b2995650080 /var | |
| parent | a4e75c7f0e43bd5c10e163a86c4d5c4d3b088c94 (diff) | |
| download | spack-3945b2adb418e2b37c6785a1a7472f1711156bf0.tar.gz spack-3945b2adb418e2b37c6785a1a7472f1711156bf0.tar.bz2 spack-3945b2adb418e2b37c6785a1a7472f1711156bf0.tar.xz spack-3945b2adb418e2b37c6785a1a7472f1711156bf0.zip | |
Augustus hash (#7447)
* augustus: 3.3 package hash changed
* augustus: bamtools libraries now seem to be in lib64
* augustus: fix lib problem with older bamtools
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/augustus/package.py | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/augustus/package.py b/var/spack/repos/builtin/packages/augustus/package.py index b7686796b5..59893e532b 100644 --- a/var/spack/repos/builtin/packages/augustus/package.py +++ b/var/spack/repos/builtin/packages/augustus/package.py @@ -49,18 +49,28 @@ class Augustus(MakefilePackage): 'bamtools'].prefix) makefile.filter('INCLUDES = *', 'INCLUDES = -I$(BAMTOOLS)/include/bamtools ') - makefile.filter('LIBS = -lbamtools -lz', - 'LIBS = $(BAMTOOLS)/lib64/' - '/libbamtools.a -lz') + if 'bamtools@2.5:' in spec: + makefile.filter('LIBS = -lbamtools -lz', + 'LIBS = $(BAMTOOLS)/lib64/' + '/libbamtools.a -lz') + if 'bamtools@:2.4' in spec: + makefile.filter('LIBS = -lbamtools -lz', + 'LIBS = $(BAMTOOLS)/lib/bamtools' + '/libbamtools.a -lz') with working_dir(join_path('auxprogs', 'bam2hints')): makefile = FileFilter('Makefile') makefile.filter('# Variable definition', 'BAMTOOLS = %s' % self.spec['bamtools'].prefix) makefile.filter('INCLUDES = /usr/include/bamtools', 'INCLUDES = $(BAMTOOLS)/include/bamtools') - makefile.filter('LIBS = -lbamtools -lz', - 'LIBS = $(BAMTOOLS)/lib64/' - '/libbamtools.a -lz') + if 'bamtools@2.5:' in spec: + makefile.filter('LIBS = -lbamtools -lz', + 'LIBS = $(BAMTOOLS)/lib64/' + '/libbamtools.a -lz') + if 'bamtools@:2.4' in spec: + makefile.filter('LIBS = -lbamtools -lz', + 'LIBS = $(BAMTOOLS)/lib/bamtools' + '/libbamtools.a -lz') def install(self, spec, prefix): install_tree('bin', join_path(self.spec.prefix, 'bin')) |