From 3945b2adb418e2b37c6785a1a7472f1711156bf0 Mon Sep 17 00:00:00 2001 From: Levi Baber Date: Fri, 9 Mar 2018 18:05:39 -0600 Subject: 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 --- .../repos/builtin/packages/augustus/package.py | 22 ++++++++++++++++------ 1 file 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')) -- cgit v1.2.3-70-g09d2