From e7016b250f505dbdd38643f967ec44020cc034fe Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Fri, 12 May 2017 14:37:18 +0200 Subject: Add pdt support to scorep (#4198) Add pdt dependency to scorep --- var/spack/repos/builtin/packages/pdt/package.py | 16 +++++++++++++++- var/spack/repos/builtin/packages/scorep/package.py | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/pdt/package.py b/var/spack/repos/builtin/packages/pdt/package.py index 589d40e843..1012911cd5 100644 --- a/var/spack/repos/builtin/packages/pdt/package.py +++ b/var/spack/repos/builtin/packages/pdt/package.py @@ -22,6 +22,7 @@ # License along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## +import os from spack import * @@ -45,4 +46,17 @@ class Pdt(AutotoolsPackage): version('3.18.1', 'e401534f5c476c3e77f05b7f73b6c4f2') def configure(self, spec, prefix): - configure('-prefix=%s' % prefix) + configure('-prefix={0}'.format(prefix)) + + @run_after('install') + def link_arch_dirs(self): + # Link arch-specific directories into prefix + for dir in os.listdir(self.prefix): + path = join_path(self.prefix, dir) + if not os.path.isdir(path) or os.path.islink(path): + continue + for d in ('bin', 'lib'): + src = join_path(path, d) + dst = join_path(self.prefix, d) + if os.path.isdir(src) and not os.path.exists(dst): + os.symlink(join_path(dir, d), dst) diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py index 75c88e7be2..f9979132b0 100644 --- a/var/spack/repos/builtin/packages/scorep/package.py +++ b/var/spack/repos/builtin/packages/scorep/package.py @@ -62,6 +62,7 @@ class Scorep(AutotoolsPackage): depends_on("mpi") depends_on("papi") + depends_on('pdt') variant('shmem', default=False, description='Enable shmem tracing') @@ -79,6 +80,7 @@ class Scorep(AutotoolsPackage): "--with-cube=%s" % spec['cube'].prefix.bin, "--with-papi-header=%s" % spec['papi'].prefix.include, "--with-papi-lib=%s" % spec['papi'].prefix.lib, + "--with-pdt=%s" % spec['pdt'].prefix.bin, "--enable-shared", ] -- cgit v1.2.3-70-g09d2