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

Merge pull request #1020 from LLNL/bugfix/libdwarf_versions

Browse source 
put older versions back + version-specific dwarfdump dir
This commit is contained in:
Todd Gamblin 2016-06-10 05:47:04 -07:00 committed by GitHub
commit bc038eb7c3
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
var/spack/repos/builtin/packages/libdwarf/package.py
View file

@ -23,11 +23,11 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import os
# Only build certain parts of dwarf because the other ones break. # Only build certain parts of dwarf because the other ones break.
dwarf_dirs = ['libdwarf', 'dwarfdump2'] dwarf_dirs = ['libdwarf', 'dwarfdump2']
class Libdwarf(Package): class Libdwarf(Package):
"""The DWARF Debugging Information Format is of interest to """The DWARF Debugging Information Format is of interest to
programmers working on compilers and debuggers (and any one programmers working on compilers and debuggers (and any one
@ -45,12 +45,13 @@ class Libdwarf(Package):
list_url = homepage list_url = homepage
version('20160507', 'ae32d6f9ece5daf05e2d4b14822ea811') version('20160507', 'ae32d6f9ece5daf05e2d4b14822ea811')
version('20130729', '4cc5e48693f7b93b7aa0261e63c0e21d')
version('20130207', '64b42692e947d5180e162e46c689dfbf')
version('20130126', 'ded74a5e90edb5a12aac3c29d260c5db')
depends_on("libelf") depends_on("libelf")
parallel = False parallel = False
def install(self, spec, prefix): def install(self, spec, prefix):
# dwarf build does not set arguments for ar properly # dwarf build does not set arguments for ar properly
make.add_default_arg('ARFLAGS=rcs') make.add_default_arg('ARFLAGS=rcs')
@ -67,7 +68,11 @@ def install(self, spec, prefix):
install('libdwarf.h', prefix.include) install('libdwarf.h', prefix.include)
install('dwarf.h', prefix.include) install('dwarf.h', prefix.include)
with working_dir('dwarfdump'): if spec.satisfies('@20130126:20130729'):
dwarfdump_dir = 'dwarfdump2'
else:
dwarfdump_dir = 'dwarfdump'
with working_dir(dwarfdump_dir):
configure("--prefix=" + prefix) configure("--prefix=" + prefix)
# This makefile has strings of copy commands that # This makefile has strings of copy commands that