summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2014-09-16 21:52:39 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2014-09-16 21:59:46 -0700
commita4c8e945c730d9028f90bb941eec98352fe6504e (patch)
tree0dc37dc355e4266fbc907346b0090dd0a310595c /var
parent656cf12cdac9bbfdcb583b29eb5d287c430ef6d6 (diff)
downloadspack-a4c8e945c730d9028f90bb941eec98352fe6504e.tar.gz
spack-a4c8e945c730d9028f90bb941eec98352fe6504e.tar.bz2
spack-a4c8e945c730d9028f90bb941eec98352fe6504e.tar.xz
spack-a4c8e945c730d9028f90bb941eec98352fe6504e.zip
Some fixups for Adam's callpath and adept-utils packages.
- Make spack packages RPATH *ALL* dependencies (i.e. the whole tree) - prevents callpath link from finding wrong libelf -- always uses the one dyninst used.
Diffstat (limited to 'var')
-rw-r--r--var/spack/packages/adept-utils/package.py (renamed from var/spack/packages/adeptutils/package.py)7
-rw-r--r--var/spack/packages/callpath/package.py9
2 files changed, 9 insertions, 7 deletions
diff --git a/var/spack/packages/adeptutils/package.py b/var/spack/packages/adept-utils/package.py
index 41bf7882db..2515322ec2 100644
--- a/var/spack/packages/adeptutils/package.py
+++ b/var/spack/packages/adept-utils/package.py
@@ -24,17 +24,18 @@
##############################################################################
from spack import *
-class Adeptutils(Package):
- """LLNL Utility Libraries"""
+class AdeptUtils(Package):
+ """Utility libraries for LLNL performance tools."""
homepage = "https://github.com/scalability-llnl/adept-utils"
url = "https://github.com/scalability-llnl/adept-utils/archive/v1.0.tar.gz"
version('1.0', '5c6cd9badce56c945ac8551e34804397')
+ depends_on("boost")
depends_on("mpi")
def install(self, spec, prefix):
- cmake("-DCMAKE_INSTALL_PREFIX=" + prefix)
+ cmake(*std_cmake_args)
make()
make("install")
diff --git a/var/spack/packages/callpath/package.py b/var/spack/packages/callpath/package.py
index 3cbfc26060..84170d9c9e 100644
--- a/var/spack/packages/callpath/package.py
+++ b/var/spack/packages/callpath/package.py
@@ -25,7 +25,8 @@
from spack import *
class Callpath(Package):
- """Library for representing callpaths consistently in distributed-memory performance tools."""
+ """Library for representing callpaths consistently in
+ distributed-memory performance tools."""
homepage = "https://github.com/scalability-llnl/callpath"
url = "https://github.com/scalability-llnl/callpath/archive/v1.0.1.tar.gz"
@@ -33,11 +34,11 @@ class Callpath(Package):
version('1.0.1', '0047983d2a52c5c335f8ba7f5bab2325')
depends_on("dyninst")
- depends_on("adeptutils")
+ depends_on("adept-utils")
depends_on("mpi")
def install(self, spec, prefix):
- cmake("-DCMAKE_INSTALL_PREFIX=" + prefix,
- "-DCALLPATH_WALKER=dyninst")
+ # TODO: offer options for the walker used.
+ cmake('.', "-DCALLPATH_WALKER=dyninst", *std_cmake_args)
make()
make("install")