diff --git a/var/spack/repos/builtin/packages/cbtf-krell/package.py b/var/spack/repos/builtin/packages/cbtf-krell/package.py index 311ec340c8e..78a589e3d9e 100644 --- a/var/spack/repos/builtin/packages/cbtf-krell/package.py +++ b/var/spack/repos/builtin/packages/cbtf-krell/package.py @@ -138,32 +138,32 @@ def set_mpi_cmakeOptions(self, spec, cmakeOptions): # openmpi if '+openmpi' in spec: - MPIOptions.extend([ + MPIOptions.append([ '-DOPENMPI_DIR=%s' % spec['openmpi'].prefix ]) # mpich if '+mpich' in spec: - MPIOptions.extend([ + MPIOptions.append([ '-DMPICH_DIR=%s' % spec['mpich'].prefix ]) # mpich2 if '+mpich2' in spec: - MPIOptions.extend([ + MPIOptions.append([ '-DMPICH2_DIR=%s' % spec['mpich2'].prefix ]) # mvapich if '+mvapich' in spec: - MPIOptions.extend([ + MPIOptions.append([ '-DMVAPICH_DIR=%s' % spec['mvapich'].prefix ]) # mvapich2 if '+mvapich2' in spec: - MPIOptions.extend([ + MPIOptions.append([ '-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix ]) # mpt if '+mpt' in spec: - MPIOptions.extend([ + MPIOptions.append([ '-DMPT_DIR=%s' % spec['mpt'].prefix ]) diff --git a/var/spack/repos/builtin/packages/openspeedshop/package.py b/var/spack/repos/builtin/packages/openspeedshop/package.py index 870482893da..d07121fda5e 100644 --- a/var/spack/repos/builtin/packages/openspeedshop/package.py +++ b/var/spack/repos/builtin/packages/openspeedshop/package.py @@ -176,22 +176,22 @@ def set_mpi_cmakeOptions(self, spec, cmakeOptions): # openmpi if '+openmpi' in spec: - MPIOptions.extend(['-DOPENMPI_DIR=%s' % spec['openmpi'].prefix]) + MPIOptions.append(['-DOPENMPI_DIR=%s' % spec['openmpi'].prefix]) # mpich if '+mpich' in spec: - MPIOptions.extend(['-DMPICH_DIR=%s' % spec['mpich'].prefix]) + MPIOptions.append(['-DMPICH_DIR=%s' % spec['mpich'].prefix]) # mpich2 if '+mpich2' in spec: - MPIOptions.extend(['-DMPICH2_DIR=%s' % spec['mpich2'].prefix]) + MPIOptions.append(['-DMPICH2_DIR=%s' % spec['mpich2'].prefix]) # mvapich if '+mvapich' in spec: - MPIOptions.extend(['-DMVAPICH_DIR=%s' % spec['mvapich'].prefix]) + MPIOptions.append(['-DMVAPICH_DIR=%s' % spec['mvapich'].prefix]) # mvapich2 if '+mvapich2' in spec: - MPIOptions.extend(['-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix]) + MPIOptions.append(['-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix]) # mpt if '+mpt' in spec: - MPIOptions.extend(['-DMPT_DIR=%s' % spec['mpt'].prefix]) + MPIOptions.append(['-DMPT_DIR=%s' % spec['mpt'].prefix]) cmakeOptions.extend(MPIOptions) @@ -202,13 +202,10 @@ def setup_environment(self, spack_env, run_env): # of OpenSpeedShop run_env.prepend_path('PATH', self.prefix.bin) - # sqlite3 path - run_env.prepend_path('PATH', self.spec['sqlite'].prefix.bin) - - # python path - run_env.prepend_path('PATH', self.spec['python'].prefix.bin) - - # Find Dyninst library path + # Find Dyninst library path, this is needed to + # set the DYNINSTAPI_RT_LIB library which is + # required for OpenSpeedShop to find loop level + # performance information dyninst_libdir = find_libraries(['libdyninstAPI_RT'], root=self.spec['dyninst'].prefix, shared=True, recurse=True)