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

binutils should link to Spack zlib installation (#3914)

Browse Source
This commit is contained in:
Adam J. Stewart 2017-04-19 23:29:27 -05:00 committed by Todd Gamblin
parent f51af42bc6
commit 3c0c0f3457
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
var/spack/repos/builtin/packages/binutils/package.py
View File

@ -39,11 +39,6 @@ class Binutils(AutotoolsPackage):
version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e') version('2.23.2', '4f8fa651e35ef262edc01d60fb45702e')
version('2.20.1', '2b9dc8f2b7dbd5ec5992c6e29de0b764') version('2.20.1', '2b9dc8f2b7dbd5ec5992c6e29de0b764')
depends_on('m4', type='build')
depends_on('flex', type='build')
depends_on('bison', type='build')
depends_on('gettext')
# Add a patch that creates binutils libiberty_pic.a which is preferred by # Add a patch that creates binutils libiberty_pic.a which is preferred by
# OpenSpeedShop and cbtf-krell # OpenSpeedShop and cbtf-krell
variant('krellpatch', default=False, variant('krellpatch', default=False,
@ -51,17 +46,24 @@ class Binutils(AutotoolsPackage):
variant('plugins', default=False, variant('plugins', default=False,
description="enable plugins, needed for gold linker") description="enable plugins, needed for gold linker")
variant('gold', default=True, description="build the gold linker") variant('gold', default=True, description="build the gold linker")
variant('libiberty', default=False, description='Also install libiberty.')
patch('binutilskrell-2.24.patch', when='@2.24+krellpatch') patch('binutilskrell-2.24.patch', when='@2.24+krellpatch')
patch('cr16.patch') patch('cr16.patch')
patch('update_symbol-2.26.patch', when='@2.26') patch('update_symbol-2.26.patch', when='@2.26')
variant('libiberty', default=False, description='Also install libiberty.') depends_on('zlib')
depends_on('m4', type='build')
depends_on('flex', type='build')
depends_on('bison', type='build')
depends_on('gettext')
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec
configure_args = [ configure_args = [
'--with-system-zlib',
'--disable-dependency-tracking', '--disable-dependency-tracking',
'--disable-werror', '--disable-werror',
'--enable-interwork', '--enable-interwork',
@ -69,7 +71,8 @@ def configure_args(self):
'--enable-shared', '--enable-shared',
'--enable-64-bit-bfd', '--enable-64-bit-bfd',
'--enable-targets=all', '--enable-targets=all',
'--with-sysroot=/'] '--with-sysroot=/',
]
if '+gold' in spec: if '+gold' in spec:
configure_args.append('--enable-gold') configure_args.append('--enable-gold')