From 7a5e806b7ade3f42deb34c999d6c32b519c559c6 Mon Sep 17 00:00:00 2001
From: Jim Galarowicz <jeg@krellinst.org>
Date: Wed, 19 Jul 2017 08:58:19 -0500
Subject: [PATCH] Fix new travis errors.

---
 var/spack/repos/builtin/packages/cbtf-lanl/package.py     | 5 -----
 var/spack/repos/builtin/packages/openspeedshop/package.py | 7 ++-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/var/spack/repos/builtin/packages/cbtf-lanl/package.py b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
index cf335011892..acd2d0fadfd 100644
--- a/var/spack/repos/builtin/packages/cbtf-lanl/package.py
+++ b/var/spack/repos/builtin/packages/cbtf-lanl/package.py
@@ -69,11 +69,6 @@ def cmake_args(self):
 
         spec = self.spec
 
-        # Add in paths for finding package config files that tell us where to
-        # find these packages
-        cmake_prefix_path = join_path(
-            spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix)
-
         cmake_args = [
             '-DCBTF_DIR=%s'               % spec['cbtf'].prefix,
             '-DCBTF_KRELL_DIR=%s'         % spec['cbtf-krell'].prefix,
diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py
index a4e9d31b066..ce6108976db 100644
--- a/var/spack/repos/builtin/packages/openspeedshop/package.py
+++ b/var/spack/repos/builtin/packages/openspeedshop/package.py
@@ -78,7 +78,8 @@ class Openspeedshop(CMakePackage):
     variant('cuda', default=False,
             description="build with cuda packages included.")
     variant('useqt4gui', default=False,
-            description="build with Qt4/Qt5 based gui package enabled. Do not build older Qt3 gui")
+            description="build with Qt4/Qt5 based gui package enabled. \
+                         Do not build older Qt3 gui")
     variant('rtfe', default=False,
             description="build for clusters heterogeneous processors \
                          on fe/be nodes.")
@@ -162,7 +163,6 @@ def cmake_args(self):
                 self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args)
 
             else:
-                cmake_prefix_path = join_path(spec['dyninst'].prefix)
                 cmake_args = []
 
                 # Appends base options to cmake_args
@@ -191,9 +191,6 @@ def cmake_args(self):
 
         elif '+cbtf' in spec:
             instrumentor_setting = "cbtf"
-            cmake_prefix_path = join_path(spec['cbtf'].prefix) \
-                + ':' + join_path(spec['cbtf-krell'].prefix)\
-                + ':' + join_path(spec['dyninst'].prefix)
 
             if '+runtime' in spec: