Merge branch 'stat' into next

4 files changed, 68 insertions, 0 deletions

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 06592febaa..97a8e6c42d 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -29,6 +29,11 @@ spack_env_path   = get_path("SPACK_ENV_PATH")
 # Figure out what type of operation we're doing
 command = os.path.basename(sys.argv[0])
 cpp, cc, ccld, ld = range(4)
+
+# TODO: this can to be removed once Jira issue SPACK-16 is resolved
+if command == 'CC':
+    command = 'c++'
+
 if command == 'cpp':
     mode = cpp
 elif command == 'ld':
@@ -90,6 +95,7 @@ for item in ['.'] + spack_env_path:
 os.environ["PATH"] = ":".join(clean_path)
 
 full_command = [command] + arguments
+
 if spack_debug:
     input_log = os.path.join(spack_build_root, 'spack_cc_in.log')
     output_log = os.path.join(spack_build_root, 'spack_cc_out.log')
diff --git a/lib/spack/spack/packages/graphlib.py b/lib/spack/spack/packages/graphlib.py
new file mode 100644
index 0000000000..c959135147
--- /dev/null
+++ b/lib/spack/spack/packages/graphlib.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class Graphlib(Package):
+    """Library to create, manipulate, and export graphs Graphlib."""
+    homepage = "http://https://github.com/lee218llnl/graphlib"
+    url      = "https://github.com/lee218llnl/graphlib/archive/v2.0.0.tar.gz"
+
+    versions = { '2.0.0' : '43c6df84f1d38ba5a5dce0ae19371a70', }
+
+    def install(self, spec, prefix):
+        cmake(".", *std_cmake_args)
+
+        make()
+        make("install")
diff --git a/lib/spack/spack/packages/mrnet.py b/lib/spack/spack/packages/mrnet.py
new file mode 100644
index 0000000000..0fcbe68ee3
--- /dev/null
+++ b/lib/spack/spack/packages/mrnet.py
@@ -0,0 +1,14 @@
+from spack import *
+
+class Mrnet(Package):
+    """The MRNet Multi-Cast Reduction Network."""
+    homepage = "http://paradyn.org/mrnet"
+    url      = "ftp://ftp.cs.wisc.edu/paradyn/mrnet/mrnet_4.0.0.tar.gz"
+
+    versions = { '4.0.0' : 'd00301c078cba57ef68613be32ceea2f', }
+
+    def install(self, spec, prefix):
+        configure("--prefix=%s" %prefix, "--enable-shared")
+
+        make(parallel=False)
+        make("install", parallel=False)
diff --git a/lib/spack/spack/packages/stat.py b/lib/spack/spack/packages/stat.py
new file mode 100644
index 0000000000..8d9d9f406a
--- /dev/null
+++ b/lib/spack/spack/packages/stat.py
@@ -0,0 +1,34 @@
+from spack import *
+
+class Stat(Package):
+    """Library to create, manipulate, and export graphs Graphlib."""
+    homepage = "http://paradyn.org/STAT/STAT.html"
+    url      = "https://github.com/lee218llnl/stat/archive/v2.0.0.tar.gz"
+
+    versions = { '2.0.0' : 'c7494210b0ba26b577171b92838e1a9b', }
+
+    depends_on('libdwarf')
+    depends_on('dyninst')
+    depends_on('graphlib')
+    #depends_on('launchmon') # TODO: when added, path gets too long (Jira SPACK-21)!
+    depends_on('mrnet')
+
+    def install(self, spec, prefix):
+        my_mrnet = spec['mrnet']
+        my_graphlib = spec['graphlib']
+        #my_launchmon = spec['launchmon']
+        my_dyninst = spec['dyninst']
+        my_libdwarf = spec['libdwarf']
+
+        # TODO: this uses the launchmon package, but path is too long (see depends_on above) (Jira SPACK-21)
+        #configure("--enable-gui", "--prefix=%s" %prefix, "--with-launchmon=%s" %my_launchmon.prefix, "--with-mrnet=%s" %my_mrnet.prefix, "--with-graphlib=%s" %my_graphlib.prefix, "--with-stackwalker=%s" %my_dyninst.prefix, "--with-libdwarf=%s" %my_libdwarf.prefix)
+
+        # TODO: the configure line above is the proper one once Jira SPACK-21 is fixed
+        configure("--enable-gui", "--prefix=%s" %prefix, "--with-launchmon=/collab/usr/global/tools/launchmon/chaos_5_x86_64_ib/launchmon-1.0.0-20140312", "--with-mrnet=%s" %my_mrnet.prefix, "--with-graphlib=%s" %my_graphlib.prefix, "--with-stackwalker=%s" %my_dyninst.prefix, "--with-libdwarf=%s" %my_libdwarf.prefix)
+
+        # TODO: remove once Jira SPACK-19 is fixed
+        import shutil
+        shutil.copy2('/usr/bin/libtool', 'libtool')
+    
+        make(parallel=False)
+        make("install")