hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dyninst: update cmake args and boost dependency (#11378)

Browse source 
* Starting with the upcoming 10.1 release, Dyninst changed the names of
  some cmake args to camel case: LIBELF_* to LibElf_* and LIBDWARF_* to
  LibDwarf_*.  This change is needed now for @develop and will be used
  for 10.1 when it is released.
* New versions of Dyninst now requires cmake version 3.4.0 or later.
* Restrict boost dependency version to < 1.70.0 to avoid build error
This commit is contained in:
Mark W. Krentel 2019-05-09 13:58:41 -05:00 committed by Peter Scheibel
parent ac3cbfd69a
commit 26b9369c57
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
var/spack/repos/builtin/packages/dyninst/package.py
View file

@ -34,7 +34,7 @@ class Dyninst(CMakePackage):
boost_libs = '+atomic+chrono+date_time+filesystem+system+thread+timer' boost_libs = '+atomic+chrono+date_time+filesystem+system+thread+timer'
depends_on('boost@1.61.0:' + boost_libs) depends_on('boost@1.61.0:1.69.99' + boost_libs)
depends_on('libiberty+pic') depends_on('libiberty+pic')
# Dyninst uses elf@1 (elfutils) starting with 9.3.0, and used # Dyninst uses elf@1 (elfutils) starting with 9.3.0, and used
@ -48,7 +48,7 @@ class Dyninst(CMakePackage):
depends_on('tbb@2018.6:', when='@10.0:') depends_on('tbb@2018.6:', when='@10.0:')
depends_on('cmake@3.0:', type='build', when='@10.0:') depends_on('cmake@3.4.0:', type='build', when='@10.0:')
depends_on('cmake@2.8:', type='build', when='@:9.99') depends_on('cmake@2.8:', type='build', when='@:9.99')
patch('stat_dysect.patch', when='+stat_dysect') patch('stat_dysect.patch', when='+stat_dysect')
@ -84,14 +84,24 @@ def cmake_args(self):
args = [ args = [
'-DPATH_BOOST=%s' % spec['boost'].prefix, '-DPATH_BOOST=%s' % spec['boost'].prefix,
'-DIBERTY_LIBRARIES=%s' % spec['libiberty'].libs, '-DIBERTY_LIBRARIES=%s' % spec['libiberty'].libs,
'-DLIBELF_INCLUDE_DIR=%s' % elf_include,
'-DLIBELF_LIBRARIES=%s' % spec['elf'].libs,
'-DLIBDWARF_INCLUDE_DIR=%s' % dwarf_include,
'-DLIBDWARF_LIBRARIES=%s' % dwarf_lib,
] ]
# 10.1 changed the spelling of LibElf and LibDwarf.
if spec.satisfies('@10.1.0:'):
args.extend([
'-DLibElf_INCLUDE_DIR=%s' % elf_include,
'-DLibElf_LIBRARIES=%s' % spec['elf'].libs,
'-DLibDwarf_INCLUDE_DIR=%s' % dwarf_include,
'-DLibDwarf_LIBRARIES=%s' % dwarf_lib,
])
else:
args.extend([
'-DLIBELF_INCLUDE_DIR=%s' % elf_include,
'-DLIBELF_LIBRARIES=%s' % spec['elf'].libs,
'-DLIBDWARF_INCLUDE_DIR=%s' % dwarf_include,
'-DLIBDWARF_LIBRARIES=%s' % dwarf_lib,
])
# TBB include and lib directories, version 10.x or later. # TBB include and lib directories, version 10.x or later.
if spec.satisfies('@10.0.0:'): if spec.satisfies('@10.0.0:'):
args.extend([ args.extend([