hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bzip2: add pic/debug options (#23230)

Browse source 
* Add pic (for static) and debug variants

* explicitly add -g flag for +debug (even though it is in Makefile)
This commit is contained in:
Peter Scheibel 2021-04-28 04:16:57 -07:00 committed by GitHub
parent 19c2ad8185
commit 10e4eeec9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
var/spack/repos/builtin/packages/bzip2/package.py
View file

@ -25,6 +25,8 @@ class Bzip2(Package, SourcewarePackage):
version('1.0.6', sha256='a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd') version('1.0.6', sha256='a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd')
variant('shared', default=True, description='Enables the build of shared libraries.') variant('shared', default=True, description='Enables the build of shared libraries.')
variant('pic', default=False, description='Build static libraries with PIC')
variant('debug', default=False, description='Enable debug symbols and disable optimization')
depends_on('diffutils', type='build') depends_on('diffutils', type='build')
@ -43,7 +45,20 @@ def libs(self):
'libbz2', root=self.prefix, shared=shared, recursive=True 'libbz2', root=self.prefix, shared=shared, recursive=True
) )
def flag_handler(self, name, flags):
if name == 'cflags':
if '+pic' in self.spec:
flags.append(self.compiler.cc_pic_flag)
if '+debug' in self.spec:
flags.append('-g')
return(flags, None, None)
def patch(self): def patch(self):
if spec.satisfies('+debug'):
for makefile in ['Makefile', 'Makefile-libbz2_so']:
filter_file(r'-O ', '-O0 ', makefile)
filter_file(r'-O2 ', '-O0 ', makefile)
# bzip2 comes with two separate Makefiles for static and dynamic builds # bzip2 comes with two separate Makefiles for static and dynamic builds
# Tell both to use Spack's compiler wrapper instead of GCC # Tell both to use Spack's compiler wrapper instead of GCC
filter_file(r'^CC=gcc', 'CC={0}'.format(spack_cc), 'Makefile') filter_file(r'^CC=gcc', 'CC={0}'.format(spack_cc), 'Makefile')