diff options
| author | Axel Huebl <axel.huebl@plasma.ninja> | 2018-03-06 17:38:40 +0900 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2018-03-06 09:38:40 +0100 |
| commit | c7a8c4a44c59de870584a9a830f29a7ac2a9924a (patch) | |
| tree | dae0071dd3aec370b2b290ae9a58e059d581d1e5 | |
| parent | 7aff7cbaec6fd13d77551154783d1d94b01b5a8d (diff) | |
| download | spack-c7a8c4a44c59de870584a9a830f29a7ac2a9924a.tar.gz spack-c7a8c4a44c59de870584a9a830f29a7ac2a9924a.tar.bz2 spack-c7a8c4a44c59de870584a9a830f29a7ac2a9924a.tar.xz spack-c7a8c4a44c59de870584a9a830f29a7ac2a9924a.zip | |
libSplash 1.7.0: Root Fix (#7368)
Fix installs as "root" user for the last libSplash release.
Missing quoting of string compares resulted in a CMake error
when run as root (e.g. in a Docker build).
| -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}) + |