From a4c8e945c730d9028f90bb941eec98352fe6504e Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Tue, 16 Sep 2014 21:52:39 -0700
Subject: 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.
---
 var/spack/packages/adept-utils/package.py | 41 +++++++++++++++++++++++++++++++
 var/spack/packages/adeptutils/package.py  | 40 ------------------------------
 var/spack/packages/callpath/package.py    |  9 ++++---
 3 files changed, 46 insertions(+), 44 deletions(-)
 create mode 100644 var/spack/packages/adept-utils/package.py
 delete mode 100644 var/spack/packages/adeptutils/package.py

(limited to 'var')

diff --git a/var/spack/packages/adept-utils/package.py b/var/spack/packages/adept-utils/package.py
new file mode 100644
index 0000000000..2515322ec2
--- /dev/null
+++ b/var/spack/packages/adept-utils/package.py
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://scalability-llnl.github.io/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public 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 *
+
+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(*std_cmake_args)
+        make()
+        make("install")
diff --git a/var/spack/packages/adeptutils/package.py b/var/spack/packages/adeptutils/package.py
deleted file mode 100644
index 41bf7882db..0000000000
--- a/var/spack/packages/adeptutils/package.py
+++ /dev/null
@@ -1,40 +0,0 @@
-##############################################################################
-# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory.
-#
-# This file is part of Spack.
-# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
-# LLNL-CODE-647188
-#
-# For details, see https://scalability-llnl.github.io/spack
-# Please also see the LICENSE file for our notice and the LGPL.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License (as published by
-# the Free Software Foundation) version 2.1 dated February 1999.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
-# conditions of the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public 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 *
-
-class Adeptutils(Package):
-    """LLNL Utility Libraries"""
-
-    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("mpi")
-
-    def install(self, spec, prefix):
-        cmake("-DCMAKE_INSTALL_PREFIX=" + prefix)
-        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")
-- 
cgit v1.2.3-60-g2f50