diff options
| author | Denis Davydov <davydden@gmail.com> | 2017-02-09 22:57:50 +0100 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-02-09 13:57:50 -0800 |
| commit | b07835904afb072049c57df43d86141e8ce1ded0 (patch) | |
| tree | cd3ad431ba41a007354ae75cb5d03000f15fc171 /var | |
| parent | b1eb921f2815309eecd5fd89c92e322b91ae46dd (diff) | |
| download | spack-b07835904afb072049c57df43d86141e8ce1ded0.tar.gz spack-b07835904afb072049c57df43d86141e8ce1ded0.tar.bz2 spack-b07835904afb072049c57df43d86141e8ce1ded0.tar.xz spack-b07835904afb072049c57df43d86141e8ce1ded0.zip | |
valgrind: add develop; fix build on macOS with clang (#3066)
- add develop version to valgrind; fix build on macOS with clang
- switch valgrind to AutotoolsPackage
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/valgrind/package.py | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/valgrind/package.py b/var/spack/repos/builtin/packages/valgrind/package.py index 0794e77ba0..b84c95fb8a 100644 --- a/var/spack/repos/builtin/packages/valgrind/package.py +++ b/var/spack/repos/builtin/packages/valgrind/package.py @@ -22,11 +22,11 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## - from spack import * +import sys -class Valgrind(Package): +class Valgrind(AutotoolsPackage): """An instrumentation framework for building dynamic analysis. There are Valgrind tools that can automatically detect many memory @@ -44,17 +44,31 @@ class Valgrind(Package): version('3.11.0', '4ea62074da73ae82e0162d6550d3f129') version('3.10.1', '60ddae962bc79e7c95cfc4667245707f') version('3.10.0', '7c311a72a20388aceced1aa5573ce970') + version('develop', svn='svn://svn.valgrind.org/valgrind/trunk') - variant('mpi', default=True, description='Activates MPI support for valgrind') + variant('mpi', default=True, + description='Activates MPI support for valgrind') variant('boost', default=True, description='Activates boost support for valgrind') depends_on('mpi', when='+mpi') depends_on('boost', when='+boost') - def install(self, spec, prefix): - options = ['--prefix=%s' % prefix, - '--enable-ubsan'] - configure(*options) - make() - make("install") + depends_on("autoconf", type='build', when='@develop') + depends_on("automake", type='build', when='@develop') + depends_on("libtool", type='build', when='@develop') + + def configure_args(self): + spec = self.spec + options = [] + if not (spec.satisfies('%clang') and sys.platform == 'darwin'): + # Otherwise with (Apple's) clang there is a linker error: + # clang: error: unknown argument: '-static-libubsan' + options.append('--enable-ubsan') + + if sys.platform == 'darwin': + options.extend([ + '--build=amd64-darwin', + '--enable-only64bit' + ]) + return options |