From 14c9c612752da6c46fb02cca7757176f0338d627 Mon Sep 17 00:00:00 2001 From: alalazo Date: Sun, 20 Dec 2015 17:38:35 +0100 Subject: tau : scorep is now a variant --- var/spack/packages/tau/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/var/spack/packages/tau/package.py b/var/spack/packages/tau/package.py index 9febb647b3..31492397d8 100644 --- a/var/spack/packages/tau/package.py +++ b/var/spack/packages/tau/package.py @@ -46,6 +46,7 @@ class Tau(Package): # TODO : shmem variant missing variant('download', default=False, description='Downloads and builds various dependencies') + variant('scorep', default=False, description='Activates SCOREP support') variant('openmp', default=True, description='Use OpenMP threads') variant('mpi', default=True, description='Specify use of TAU MPI wrapper library') variant('phase', default=True, description='Generate phase based profiles') @@ -54,7 +55,7 @@ class Tau(Package): # TODO : Try to build direct OTF2 support? Some parts of the OTF support library in TAU are non-conformant, # TODO : and fail at compile-time. Further, SCOREP is compiled with OTF2 support. depends_on('pdt') # Required for TAU instrumentation - depends_on('scorep') + depends_on('scorep', when='+scorep') depends_on('binutils', when='~download') depends_on('mpi', when='+mpi') @@ -95,8 +96,7 @@ class Tau(Package): # As such it has a few #peculiarities# that make this build quite hackish. options = ["-prefix=%s" % prefix, "-iowrapper", - "-pdt=%s" % spec['pdt'].prefix, - "-scorep=%s" % spec['scorep'].prefix] + "-pdt=%s" % spec['pdt'].prefix] # If download is active, download and build suggested dependencies if '+download' in spec: options.extend(['-bfd=download', @@ -106,6 +106,9 @@ class Tau(Package): options.extend(["-bfd=%s" % spec['binutils'].prefix]) # TODO : unwind and asmdex are still missing + if '+scorep' in spec: + options.append("-scorep=%s" % spec['scorep'].prefix) + if '+openmp' in spec: options.append('-openmp') -- cgit v1.2.3-70-g09d2