From 30d487509b1a106b43bfe4faf02ddd3355466ab1 Mon Sep 17 00:00:00 2001 From: wspear Date: Mon, 17 Feb 2020 15:19:48 -0800 Subject: Added new default tau version: 2.29. Added explicit zlib build requir… (#15010) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added new default tau version: 2.29. Added explicit zlib build requirement. Set up environment to use use elf and libz * Changed zlib to link dependency. Removed elf library path load (wasn't able to reproduce the need for this) --- var/spack/repos/builtin/packages/tau/package.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/var/spack/repos/builtin/packages/tau/package.py b/var/spack/repos/builtin/packages/tau/package.py index 2aadb64590..c5ac0a43e8 100644 --- a/var/spack/repos/builtin/packages/tau/package.py +++ b/var/spack/repos/builtin/packages/tau/package.py @@ -23,6 +23,7 @@ class Tau(Package): git = "https://github.com/UO-OACISS/tau2" version('develop', branch='master') + version('2.29', sha256='146be769a23c869a7935e8fa5ba79f40ba36b9057a96dda3be6730fc9ca86086') version('2.28.2', sha256='64e129a482056755012b91dae2fb4f728dbf3adbab53d49187eca952891c5457') version('2.28.1', sha256='b262e5c9977471e9f5a8d729b3db743012df9b0ab8244da2842039f8a3b98b34') version('2.28', sha256='68c6f13ae748d12c921456e494006796ca2b0efebdeef76ee7c898c81592883e') @@ -75,6 +76,7 @@ class Tau(Package): variant('ppc64le', default=False, description='Build for IBM Power LE nodes') variant('x86_64', default=False, description='Force build for x86 Linux instead of auto-detect') + depends_on('zlib', type='link') depends_on('pdt', when='+pdt') # Required for TAU instrumentation depends_on('scorep', when='+scorep') depends_on('otf2@2.1:', when='+otf2') @@ -131,6 +133,9 @@ class Tau(Package): compiler_options.append(useropt) return compiler_options + def setup_build_environment(self, env): + env.prepend_path('LIBRARY_PATH', self.spec['zlib'].prefix.lib) + def install(self, spec, prefix): # TAU isn't happy with directories that have '@' in the path. Sigh. change_sed_delimiter('@', ';', 'configure') -- cgit v1.2.3-70-g09d2