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

libunwind: remove version 2018.10.12, add stable branch (#15316)

Browse Source 
* libunwind: remove version 2018.10.12, add stable branch

Finish cleaning up the libunwind version numbers.  The 2018.10.12
snapshot number didn't fit well with spack's ordering (my bad), and
1.4-rc1 is a near identical replacement.

Add a version for the 1.4-stable branch.

Add a variant for zlib compressed symbol tables (develop branch only).

Adjust packages caliper and hpctoolkit to adapt to the changes.

Add myself as maintainer.

* Flake

* Settle on renaming 'develop' to 'master' (to match the branch name)
and name the 'v1.4-stable' branch as '1.4-head'.  'stable' or
'1.4-stable' is a better name, but '1.4-head' (an infinity version)
sorts better.
This commit is contained in:
Mark W. Krentel 2020-03-06 08:49:46 -06:00 committed by GitHub
parent 8687ace8f9
commit 441340771d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
var/spack/repos/builtin/packages/caliper/package.py
View File

@ -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')

25
var/spack/repos/builtin/packages/libunwind/package.py
View File

@ -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 @@ def configure_args(self):
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