summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreugeneswalker <38933153+eugeneswalker@users.noreply.github.com>2024-01-26 13:56:16 -0800
committerGitHub <noreply@github.com>2024-01-26 13:56:16 -0800
commit803ad69eb152be3760e035d9c908e9ddf5e85df2 (patch)
tree98fd873450e2437e20033a68311ceb77ecea3120
parent29d784e5fa4651e3a47af766057ebc06ee558420 (diff)
downloadspack-803ad69eb152be3760e035d9c908e9ddf5e85df2.tar.gz
spack-803ad69eb152be3760e035d9c908e9ddf5e85df2.tar.bz2
spack-803ad69eb152be3760e035d9c908e9ddf5e85df2.tar.xz
spack-803ad69eb152be3760e035d9c908e9ddf5e85df2.zip
hydrogen@1.5.3: cmake patch with ESCAPE_QUOTES (#42325)
-rw-r--r--var/spack/repos/builtin/packages/hydrogen/cmake-intel-mpi-escape-quotes-pr177.patch12
-rw-r--r--var/spack/repos/builtin/packages/hydrogen/package.py4
2 files changed, 16 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/hydrogen/cmake-intel-mpi-escape-quotes-pr177.patch b/var/spack/repos/builtin/packages/hydrogen/cmake-intel-mpi-escape-quotes-pr177.patch
new file mode 100644
index 0000000000..3d2c059cde
--- /dev/null
+++ b/var/spack/repos/builtin/packages/hydrogen/cmake-intel-mpi-escape-quotes-pr177.patch
@@ -0,0 +1,12 @@
+diff -ruN spack-src/CMakeLists.txt spack-src-patched/CMakeLists.txt
+--- spack-src/CMakeLists.txt 2023-11-07 21:54:14.000000000 +0000
++++ spack-src-patched/CMakeLists.txt 2024-01-26 19:32:52.140539356 +0000
+@@ -515,7 +515,7 @@
+ # docs (which has the advantage that preprocessing will take
+ # "{,hydrogen_}config.h" into consideration).
+ configure_file("${PROJECT_SOURCE_DIR}/cmake/configure_files/config.h.in"
+- "${PROJECT_BINARY_DIR}/include/El/config.h")
++ "${PROJECT_BINARY_DIR}/include/El/config.h" ESCAPE_QUOTES)
+ configure_file("${PROJECT_SOURCE_DIR}/cmake/configure_files/hydrogen_config.h.in"
+ "${PROJECT_BINARY_DIR}/include/El/hydrogen_config.h")
+ configure_file("${PROJECT_SOURCE_DIR}/doxy/Doxyfile.in"
diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py
index fc30587fb3..2847431ef9 100644
--- a/var/spack/repos/builtin/packages/hydrogen/package.py
+++ b/var/spack/repos/builtin/packages/hydrogen/package.py
@@ -130,6 +130,10 @@ class Hydrogen(CachedCMakePackage, CudaPackage, ROCmPackage):
depends_on("llvm-openmp", when="%apple-clang +openmp")
+ # Fixes https://github.com/spack/spack/issues/42286
+ # https://github.com/LLNL/Elemental/pull/177
+ patch("cmake-intel-mpi-escape-quotes-pr177.patch", when="@1.5.3")
+
@property
def libs(self):
shared = True if "+shared" in self.spec else False