diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/py-espresso/2244.patch | 25 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-espresso/package.py | 6 |
2 files changed, 31 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-espresso/2244.patch b/var/spack/repos/builtin/packages/py-espresso/2244.patch new file mode 100644 index 0000000000..9a6b95a573 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-espresso/2244.patch @@ -0,0 +1,25 @@ +From 8c1b77e48f2984f7a11434959e37d08514521595 Mon Sep 17 00:00:00 2001 +From: Christoph Junghans <junghans@votca.org> +Date: Sun, 9 Sep 2018 07:04:09 -0600 +Subject: [PATCH] cmake: workaround for cmake bug#18349 + +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8f384f423b..f84095b5f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -286,7 +286,10 @@ endif(WITH_VALGRIND_INSTRUMENTATION) + ####################################################################### + + find_package(MPI REQUIRED) +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MPI_COMPILE_FLAGS}") ++# Workaround for https://gitlab.kitware.com/cmake/cmake/issues/18349 ++foreach(_MPI_FLAG ${MPI_COMPILE_FLAGS}) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_MPI_FLAG}") ++endforeach() + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MPI_LINK_FLAGS}") + include_directories(SYSTEM ${MPI_INCLUDE_PATH}) + list(APPEND LIBRARIES ${MPI_LIBRARIES}) diff --git a/var/spack/repos/builtin/packages/py-espresso/package.py b/var/spack/repos/builtin/packages/py-espresso/package.py index a1a57c2413..8d00a92f4a 100644 --- a/var/spack/repos/builtin/packages/py-espresso/package.py +++ b/var/spack/repos/builtin/packages/py-espresso/package.py @@ -39,8 +39,13 @@ class PyEspresso(CMakePackage): """ homepage = "http://espressomd.org/" git = "https://github.com/espressomd/espresso.git" + url = "https://github.com/espressomd/espresso/releases/download/4.0.0/espresso-4.0.0.tar.gz" version('develop', branch='python') + version('4.0.0', sha256='8e128847447eebd843de24be9b4ad14aa19c028ae48879a5a4535a9683836e6b') + + # https://github.com/espressomd/espresso/pull/2244 + patch('2244.patch') depends_on("cmake@3.0:", type='build') depends_on("mpi") @@ -49,3 +54,4 @@ class PyEspresso(CMakePackage): depends_on("py-cython@0.23:", type="build") depends_on("py-numpy", type=("build", "run")) depends_on("fftw") + depends_on("hdf5+hl+mpi") |