Merge pull request #17 in SCALE/spack from features/dotkit to develop

# By Todd Gamblin
# Via Todd Gamblin
* commit '295ffd8c506821ed079d2151fb21cd27979d7387':
  Adding dotkit support to TAU.

2 files changed, 27 insertions, 0 deletions

diff --git a/var/spack/packages/libdwarf/package.py b/var/spack/packages/libdwarf/package.py
index 000187736c..abd6d1f4a1 100644
--- a/var/spack/packages/libdwarf/package.py
+++ b/var/spack/packages/libdwarf/package.py
@@ -29,6 +29,17 @@ import os
 dwarf_dirs = ['libdwarf', 'dwarfdump2']
 
 class Libdwarf(Package):
+    """The DWARF Debugging Information Format is of interest to
+       programmers working on compilers and debuggers (and any one
+       interested in reading or writing DWARF information). It was
+       developed by a committee (known as the PLSIG at the time)
+       starting around 1991. Starting around 1991 SGI developed the
+       libdwarf and dwarfdump tools for internal use and as part of
+       SGI IRIX developer tools. Since that time dwarfdump and
+       libdwarf have been shipped (as an executable and archive
+       respectively, not source) with every release of the SGI
+       MIPS/IRIX C compiler."""
+
     homepage = "http://www.prevanders.net/dwarf.html"
     url      = "http://www.prevanders.net/libdwarf-20130729.tar.gz"
     list_url = homepage
diff --git a/var/spack/packages/tau/package.py b/var/spack/packages/tau/package.py
index 373c51c8b8..62c467b572 100644
--- a/var/spack/packages/tau/package.py
+++ b/var/spack/packages/tau/package.py
@@ -1,5 +1,8 @@
 from spack import *
 
+import os
+from llnl.util.filesystem import join_path
+
 class Tau(Package):
     """A portable profiling and tracing toolkit for performance
        analysis of parallel programs written in Fortran, C, C++, UPC,
@@ -18,3 +21,16 @@ class Tau(Package):
         # After that, it's relatively standard.
         configure("-prefix=%s" % prefix)
         make("install")
+
+        # Link arch-specific directories into prefix since there is
+        # only one arch per prefix the way spack installs.
+        self.link_tau_arch_dirs()
+
+
+    def link_tau_arch_dirs(self):
+        for subdir in os.listdir(self.prefix):
+            for d in ('bin', 'lib'):
+                src  = join_path(self.prefix, subdir, d)
+                dest = join_path(self.prefix, d)
+                if os.path.isdir(src) and not os.path.exists(dest):
+                    os.symlink(join_path(subdir, d), dest)