Change back the previous boost change and change the mrnet variant name to lwthreads.

7 files changed, 16 insertions, 17 deletions

diff --git a/var/spack/packages/boost/package.py b/var/spack/packages/boost/package.py
index fc721753c7..81dadbbf61 100644
--- a/var/spack/packages/boost/package.py
+++ b/var/spack/packages/boost/package.py
@@ -58,8 +58,7 @@ class Boost(Package):
         parts = [str(p) for p in Version(version)]
         dots = ".".join(parts)
         underscores = "_".join(parts)
-        #return "http://downloads.sourceforge.net/project/boost/boost/%s/boost_%s.tar.bz2" % (
-        return "http://downloads.sourceforge.net/project/boost/boost/%s.0/boost_%s_0.tar.bz2" % (
+        return "http://downloads.sourceforge.net/project/boost/boost/%s/boost_%s.tar.bz2" % (
             dots, underscores)
 
     def determine_toolset(self):
diff --git a/var/spack/packages/cbtf-argonavis/package.py b/var/spack/packages/cbtf-argonavis/package.py
index 2dccb0e0c6..7b07933911 100644
--- a/var/spack/packages/cbtf-argonavis/package.py
+++ b/var/spack/packages/cbtf-argonavis/package.py
@@ -33,7 +33,7 @@ class CbtfArgonavis(Package):
     depends_on("papi")
     depends_on("cbtf")
     depends_on("cbtf-krell")
-    #depends_on("cuda")
+    depends_on("cuda")
 
     parallel = False
 
@@ -43,8 +43,8 @@ class CbtfArgonavis(Package):
        cmake_prefix_path = join_path(spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix)
 
        # FIXME, hard coded for testing purposes, we will alter when the external package feature is available
-       cuda_prefix_path = "/opt/cudatoolkit-6.5"
-       cupti_prefix_path = "/opt/cudatoolkit-6.5/extras/CUPTI"
+       cuda_prefix_path = "/usr/local/cudatoolkit-6.0"
+       cupti_prefix_path = "/usr/local/cudatoolkit-6.0/extras/CUPTI"
 
 
        with working_dir('CUDA'):
@@ -56,6 +56,7 @@ class CbtfArgonavis(Package):
                  '-DCUDA_INSTALL_PATH=%s'	% cuda_prefix_path,
                  '-DCUDA_ROOT=%s'		% cuda_prefix_path,
                  '-DCUPTI_ROOT=%s'		% cupti_prefix_path,
+                 '-DCUDA_DIR=%s'                % cuda_prefix_path,
                  '-DPAPI_ROOT=%s'		% spec['papi'].prefix,
                  '-DCBTF_PREFIX=%s'		% spec['cbtf'].prefix,
                  *std_cmake_args)
diff --git a/var/spack/packages/cbtf-krell/package.py b/var/spack/packages/cbtf-krell/package.py
index d9a2b7f8b5..9458ac113c 100644
--- a/var/spack/packages/cbtf-krell/package.py
+++ b/var/spack/packages/cbtf-krell/package.py
@@ -38,9 +38,9 @@ class CbtfKrell(Package):
     depends_on("binutils@2.24+krellpatch")
 
     # collectionTool
-    depends_on("boost@1.50")
+    depends_on("boost@1.50.0")
     depends_on("dyninst@8.2.1")
-    depends_on("mrnet@4.1.0:+krelloptions")
+    depends_on("mrnet@4.1.0:+lwthreads")
     depends_on("xerces-c@3.1.1:")
     depends_on("cbtf")
 
diff --git a/var/spack/packages/cbtf-lanl/package.py b/var/spack/packages/cbtf-lanl/package.py
index 14651723cd..2da9e8a1f7 100644
--- a/var/spack/packages/cbtf-lanl/package.py
+++ b/var/spack/packages/cbtf-lanl/package.py
@@ -32,7 +32,7 @@ class CbtfLanl(Package):
 
     # Dependencies for cbtf-krell
     depends_on("boost@1.50")
-    depends_on("mrnet@4.1.0+krelloptions")
+    depends_on("mrnet@4.1.0:+lwthreads")
     depends_on("xerces-c@3.1.1:")
     depends_on("cbtf")
     depends_on("cbtf-krell")
diff --git a/var/spack/packages/cbtf/package.py b/var/spack/packages/cbtf/package.py
index 6f1e49deed..52e6a07020 100644
--- a/var/spack/packages/cbtf/package.py
+++ b/var/spack/packages/cbtf/package.py
@@ -32,9 +32,9 @@ class Cbtf(Package):
     version('1.6', branch='master', git='http://git.code.sf.net/p/cbtf/cbtf')
 
     depends_on("cmake")
-    #depends_on("boost@1.42:")
-    depends_on("boost@1.50")
-    depends_on("mrnet@4.1.0+krelloptions")
+    #depends_on("boost@1.42.0:")
+    depends_on("boost@1.50.0")
+    depends_on("mrnet@4.1.0+lwthreads")
     depends_on("xerces-c@3.1.1:")
     depends_on("libxml2")
 
@@ -43,7 +43,6 @@ class Cbtf(Package):
     def install(self, spec, prefix):
       with working_dir('build', create=True):
 
-
           # Boost_NO_SYSTEM_PATHS  Set to TRUE to suppress searching   
           # in system paths (or other locations outside of BOOST_ROOT
           # or BOOST_INCLUDEDIR).  Useful when specifying BOOST_ROOT. 
diff --git a/var/spack/packages/mrnet/package.py b/var/spack/packages/mrnet/package.py
index 08c57d7436..3eb33d0714 100644
--- a/var/spack/packages/mrnet/package.py
+++ b/var/spack/packages/mrnet/package.py
@@ -8,14 +8,14 @@ class Mrnet(Package):
     version('4.0.0', 'd00301c078cba57ef68613be32ceea2f')
     version('4.1.0', '5a248298b395b329e2371bf25366115c')
 
-    variant('krelloptions', default=False, description="Also build the MRNet LW threadsafe libraries")
+    variant('lwthreads', default=False, description="Also build the MRNet LW threadsafe libraries")
     parallel = False
 
     depends_on("boost")
 
     def install(self, spec, prefix):
         # Build the MRNet LW thread safe libraries when the krelloptions variant is present
-        if '+krelloptions' in spec:
+        if '+lwthreads' in spec:
            configure("--prefix=%s" %prefix, "--enable-shared", "--enable-ltwt-threadsafe")
         else:
            configure("--prefix=%s" %prefix, "--enable-shared")
diff --git a/var/spack/packages/openspeedshop/package.py b/var/spack/packages/openspeedshop/package.py
index d439fba734..8c71bcb7c3 100644
--- a/var/spack/packages/openspeedshop/package.py
+++ b/var/spack/packages/openspeedshop/package.py
@@ -63,7 +63,7 @@ class Openspeedshop(Package):
     depends_on("libelf")
     depends_on("libdwarf")
     depends_on("sqlite")
-    depends_on("boost@1.50")
+    depends_on("boost@1.50.0")
     depends_on("dyninst@8.2.1")
     depends_on("python")
     depends_on("qt@3.3.8b+krellpatch")
@@ -79,8 +79,8 @@ class Openspeedshop(Package):
     # Dependencies only for the openspeedshop cbtf package.
     depends_on("cbtf", when='+cbtf')
     depends_on("cbtf-krell", when='+cbtf')
-    #depends_on("cbtf-argonavis", when='+cbtf')
-    depends_on("mrnet@4.1.0:+krelloptions", when='+cbtf')
+    depends_on("cbtf-argonavis", when='+cbtf')
+    depends_on("mrnet@4.1.0:+lwthreads", when='+cbtf')
 
     def install(self, spec, prefix):