From 686f0e21de510a12ee3d6af410448eb405d3e7b6 Mon Sep 17 00:00:00 2001 From: "Mark W. Krentel" Date: Thu, 23 Apr 2020 12:34:19 -0500 Subject: libunwind: add 1.4.0 release and 1.5 stable branch (#16261) --- .../repos/builtin/packages/libunwind/package.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libunwind/package.py b/var/spack/repos/builtin/packages/libunwind/package.py index 971840f5e0..1a4ae5524c 100644 --- a/var/spack/repos/builtin/packages/libunwind/package.py +++ b/var/spack/repos/builtin/packages/libunwind/package.py @@ -16,9 +16,12 @@ class Libunwind(AutotoolsPackage): maintainers = ['mwkrentel'] version('master', branch='master') + version('1.5-head', branch='v1.5-stable') + version('1.5-rc1', sha256='3e0cbc6dee326592097ef06e97cf76ef597987eddd0df8bea49b0594e587627a') version('1.4-head', branch='v1.4-stable') + version('1.4.0', sha256='df59c931bd4d7ebfd83ee481c943edf015138089b8e50abed8d9c57ba9338435', preferred=True) version('1.4-rc1', sha256='1928459139f048f9b4aca4bb5010540cb7718d44220835a2980b85429007fa9f') - version('1.3.1', sha256='43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8', preferred=True) + version('1.3.1', sha256='43997a3939b6ccdf2f669b50fdb8a4d3205374728c2923ddc2354c65260214f8') version('1.2.1', sha256='3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb') version('1.1', sha256='9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a') @@ -26,15 +29,15 @@ class Libunwind(AutotoolsPackage): description='Support xz (lzma) compressed symbol tables.') variant('zlib', default=False, - description='Support zlib compressed symbol tables (master ' - 'branch only).') + description='Support zlib compressed symbol tables ' + '(1.5 and later).') # The libunwind releases contain the autotools generated files, # but the git repo snapshots do not. - 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('autoconf', type='build', when='@master,1.4-head,1.5-head') + depends_on('automake', type='build', when='@master,1.4-head,1.5-head') + depends_on('libtool', type='build', when='@master,1.4-head,1.5-head') + depends_on('m4', type='build', when='@master,1.4-head,1.5-head') depends_on('xz', type='link', when='+xz') depends_on('zlib', type='link', when='+zlib') @@ -55,8 +58,8 @@ class Libunwind(AutotoolsPackage): else: args.append('--disable-minidebuginfo') - # zlib support is only in the master branch (for now). - if spec.satisfies('@master'): + # zlib support is available in 1.5.x and later + if spec.satisfies('@1.5:'): if '+zlib' in spec: args.append('--enable-zlibdebuginfo') else: -- cgit v1.2.3-60-g2f50