diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-06-10 05:47:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 05:47:04 -0700 |
| commit | bc038eb7c36bbc24133311c167d4457b39de4a8a (patch) | |
| tree | f314702fb744f124c483c4dc61000b102ebacdbb | |
| parent | 30e8e77fb60b06535b49d54db62781299f555a8d (diff) | |
| parent | bb57b82794bf8434904235af42ad15914eff24ee (diff) | |
| download | spack-bc038eb7c36bbc24133311c167d4457b39de4a8a.tar.gz spack-bc038eb7c36bbc24133311c167d4457b39de4a8a.tar.bz2 spack-bc038eb7c36bbc24133311c167d4457b39de4a8a.tar.xz spack-bc038eb7c36bbc24133311c167d4457b39de4a8a.zip | |
Merge pull request #1020 from LLNL/bugfix/libdwarf_versions
put older versions back + version-specific dwarfdump dir
| -rw-r--r-- | var/spack/repos/builtin/packages/libdwarf/package.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/libdwarf/package.py b/var/spack/repos/builtin/packages/libdwarf/package.py index c9c6e9404f..594271f655 100644 --- a/var/spack/repos/builtin/packages/libdwarf/package.py +++ b/var/spack/repos/builtin/packages/libdwarf/package.py @@ -23,11 +23,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * -import os # Only build certain parts of dwarf because the other ones break. dwarf_dirs = ['libdwarf', 'dwarfdump2'] + class Libdwarf(Package): """The DWARF Debugging Information Format is of interest to programmers working on compilers and debuggers (and any one @@ -45,12 +45,13 @@ class Libdwarf(Package): list_url = homepage version('20160507', 'ae32d6f9ece5daf05e2d4b14822ea811') - + version('20130729', '4cc5e48693f7b93b7aa0261e63c0e21d') + version('20130207', '64b42692e947d5180e162e46c689dfbf') + version('20130126', 'ded74a5e90edb5a12aac3c29d260c5db') depends_on("libelf") parallel = False - def install(self, spec, prefix): # dwarf build does not set arguments for ar properly make.add_default_arg('ARFLAGS=rcs') @@ -67,7 +68,11 @@ class Libdwarf(Package): install('libdwarf.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) # This makefile has strings of copy commands that |