diff options
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/libsplash/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libsplash/root_cmake_1.7.0.patch | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/libsplash/package.py b/var/spack/repos/builtin/packages/libsplash/package.py index 0388b31a3f..e8493bdba2 100644 --- a/var/spack/repos/builtin/packages/libsplash/package.py +++ b/var/spack/repos/builtin/packages/libsplash/package.py @@ -57,6 +57,8 @@ class Libsplash(CMakePackage): depends_on('hdf5@1.8.6: +mpi', when='+mpi') depends_on('mpi', when='+mpi') + patch('root_cmake_1.7.0.patch', when='@1.7.0') + def cmake_args(self): spec = self.spec args = [] diff --git a/var/spack/repos/builtin/packages/libsplash/root_cmake_1.7.0.patch b/var/spack/repos/builtin/packages/libsplash/root_cmake_1.7.0.patch new file mode 100644 index 0000000000..788e24925d --- /dev/null +++ b/var/spack/repos/builtin/packages/libsplash/root_cmake_1.7.0.patch @@ -0,0 +1,15 @@ +diff --git CMakeLists.txt CMakeLists.txt +index 4846ff7..5e102ce 100644 +--- libSplash-1.7.0/CMakeLists.txt ++++ libSplash-1.7.0/CMakeLists.txt +@@ -392,7 +392,8 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tools/splash2xdmf.py DESTINATION bin) + # + enable_testing() + +-if($ENV{USER} STREQUAL root) ++# OpenMPI root guard: https://github.com/open-mpi/ompi/issues/4451 ++if("$ENV{USER}" STREQUAL "root") + set(MPI_ALLOW_ROOT --allow-run-as-root) + endif() + set(MPI_TEST_EXE ${MPIEXEC_EXECUTABLE} ${MPI_ALLOW_ROOT} ${MPIEXEC_NUMPROC_FLAG}) + |