summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTim Haines <thaines.astro@gmail.com>2020-08-31 22:35:18 -0500
committerGitHub <noreply@github.com>2020-09-01 05:35:18 +0200
commit7926f84022e4f22bcaa120dd444dee096223f743 (patch)
tree9e6120b7880e3255d0c399938e42603f5157b1d6 /var
parent9b6c2e80fe1eea0e01a5d560ec910e72b738b6c5 (diff)
downloadspack-7926f84022e4f22bcaa120dd444dee096223f743.tar.gz
spack-7926f84022e4f22bcaa120dd444dee096223f743.tar.bz2
spack-7926f84022e4f22bcaa120dd444dee096223f743.tar.xz
spack-7926f84022e4f22bcaa120dd444dee096223f743.zip
elfutils: add support for debuginfod (#18227)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/elfutils/package.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/elfutils/package.py b/var/spack/repos/builtin/packages/elfutils/package.py
index 00647d2d4e..8e1f520d7b 100644
--- a/var/spack/repos/builtin/packages/elfutils/package.py
+++ b/var/spack/repos/builtin/packages/elfutils/package.py
@@ -43,13 +43,25 @@ class Elfutils(AutotoolsPackage, SourcewarePackage):
variant('nls', default=True,
description='Enable Native Language Support.')
+ # libdebuginfod support
+ variant('debuginfod', default=False,
+ description='Enable libdebuginfod support.')
+
depends_on('bzip2', type='link', when='+bzip2')
depends_on('xz', type='link', when='+xz')
depends_on('zlib', type='link')
depends_on('gettext', when='+nls')
depends_on('m4', type='build')
+ # debuginfod has extra dependencies
+ # NB: Waiting on an elfutils patch before we can use libmicrohttpd@0.9.71
+ depends_on('libmicrohttpd@0.9.33:0.9.70', type='link', when='+debuginfod')
+ depends_on('libarchive@3.1.2:', type='link', when='+debuginfod')
+ depends_on('sqlite@3.7.17:', type='link', when='+debuginfod')
+ depends_on('curl@7.29.0:', type='link', when='+debuginfod')
+
conflicts('%gcc@7.2.0:', when='@0.163')
+ conflicts('+debuginfod', when='@:0.178')
provides('elf@1')
@@ -92,9 +104,9 @@ class Elfutils(AutotoolsPackage, SourcewarePackage):
else:
args.append('--disable-nls')
- # The experimental debuginfod server requires libmicrohttpd
- # which doesn't have a spack package
- if spec.satisfies('@0.178:'):
+ if '+debuginfod' in spec:
+ args.append('--enable-debuginfod')
+ elif spec.satisfies('@0.178:'):
args.append('--disable-debuginfod')
return args