diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/caliper/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libunwind/package.py | 25 |
2 files changed, 20 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index bfe9b58ba7..53b34dd04d 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -64,7 +64,7 @@ class Caliper(CMakePackage): depends_on('libpfm4@4.8:4.99', when='+libpfm') depends_on('mpi', when='+mpi') - depends_on('unwind@2018.10.12,1.2:1.99', when='+callpath') + depends_on('unwind@1.2:1.99', when='+callpath') depends_on('sosflow@spack', when='@1.0:1.99+sosflow') diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index b8e01f0a92..971840f5e0 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -13,9 +13,10 @@ class Libunwind(AutotoolsPackage): homepage = "http://www.nongnu.org/libunwind/" url = "http://download.savannah.gnu.org/releases/libunwind/libunwind-1.1.tar.gz" git = "https://github.com/libunwind/libunwind" + maintainers = ['mwkrentel'] - version('develop', branch='master') - version('2018.10.12', commit='f551e16213c52169af8bda554e4051b756a169cc') + version('master', branch='master') + version('1.4-head', branch='v1.4-stable') version('1.4-rc1', sha256='1928459139f048f9b4aca4bb5010540cb7718d44220835a2980b85429007fa9f') version('1.3.1', sha256='43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8', preferred=True) version('1.2.1', sha256='3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb') @@ -24,14 +25,19 @@ class Libunwind(AutotoolsPackage): variant('xz', default=False, description='Support xz (lzma) compressed symbol tables.') + variant('zlib', default=False, + description='Support zlib compressed symbol tables (master ' + 'branch only).') + # The libunwind releases contain the autotools generated files, # but the git repo snapshots do not. - depends_on('autoconf', type='build', when='@2018:') - depends_on('automake', type='build', when='@2018:') - depends_on('libtool', type='build', when='@2018:') - depends_on('m4', type='build', when='@2018:') + depends_on('autoconf', type='build', when='@master,1.4-head') + depends_on('automake', type='build', when='@master,1.4-head') + depends_on('libtool', type='build', when='@master,1.4-head') + depends_on('m4', type='build', when='@master,1.4-head') depends_on('xz', type='link', when='+xz') + depends_on('zlib', type='link', when='+zlib') conflicts('platform=darwin', msg='Non-GNU libunwind needs ELF libraries Darwin does not have') @@ -49,4 +55,11 @@ class Libunwind(AutotoolsPackage): else: args.append('--disable-minidebuginfo') + # zlib support is only in the master branch (for now). + if spec.satisfies('@master'): + if '+zlib' in spec: + args.append('--enable-zlibdebuginfo') + else: + args.append('--disable-zlibdebuginfo') + return args |