summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicente Bolea <vicente.bolea@kitware.com>2023-11-06 15:15:29 -0500
committerGitHub <noreply@github.com>2023-11-06 12:15:29 -0800
commitf0f6e54b295f1ff0d63b39c1932f9ab80d4bc243 (patch)
tree1cbf8d46aebfc12415174af83a5b6c16ab0f66df
parenta2f00886e911a8219bfac27752e5c7fd83c65280 (diff)
downloadspack-f0f6e54b295f1ff0d63b39c1932f9ab80d4bc243.tar.gz
spack-f0f6e54b295f1ff0d63b39c1932f9ab80d4bc243.tar.bz2
spack-f0f6e54b295f1ff0d63b39c1932f9ab80d4bc243.tar.xz
spack-f0f6e54b295f1ff0d63b39c1932f9ab80d4bc243.zip
adios2: add v2.9.2 release (#40832)
-rw-r--r--var/spack/repos/builtin/packages/adios2/2.9.2-cmake-find-threads-package-first.patch36
-rw-r--r--var/spack/repos/builtin/packages/adios2/package.py9
2 files changed, 43 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/adios2/2.9.2-cmake-find-threads-package-first.patch b/var/spack/repos/builtin/packages/adios2/2.9.2-cmake-find-threads-package-first.patch
new file mode 100644
index 0000000000..afc6808d28
--- /dev/null
+++ b/var/spack/repos/builtin/packages/adios2/2.9.2-cmake-find-threads-package-first.patch
@@ -0,0 +1,36 @@
+From 80e4739fb53b0b7e02dae48b928d8b8247992763 Mon Sep 17 00:00:00 2001
+From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
+Date: Thu, 2 Nov 2023 12:18:49 -0400
+Subject: [PATCH] cmake: find threads package first
+
+---
+ cmake/DetectOptions.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
+index 3f511e02a..615995b71 100644
+--- a/cmake/DetectOptions.cmake
++++ b/cmake/DetectOptions.cmake
+@@ -67,6 +67,9 @@ function(lists_get_prefix listVars outVar)
+ set(${outVar} "${prefix}" PARENT_SCOPE)
+ endfunction()
+
++# Multithreading
++find_package(Threads REQUIRED)
++
+ # Blosc2
+ if(ADIOS2_USE_Blosc2 STREQUAL AUTO)
+ # Prefect CONFIG mode
+@@ -554,9 +557,6 @@ if(AWSSDK_FOUND)
+ set(ADIOS2_HAVE_AWSSDK TRUE)
+ endif()
+
+-# Multithreading
+-find_package(Threads REQUIRED)
+-
+ # Floating point detection
+ include(CheckTypeRepresentation)
+
+--
+2.35.3
+
diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
index 218457f3e3..4a038ddcac 100644
--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -24,10 +24,11 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
version("master", branch="master")
version(
- "2.9.1",
- sha256="ddfa32c14494250ee8a48ef1c97a1bf6442c15484bbbd4669228a0f90242f4f9",
+ "2.9.2",
+ sha256="78309297c82a95ee38ed3224c98b93d330128c753a43893f63bbe969320e4979",
preferred=True,
)
+ version("2.9.1", sha256="ddfa32c14494250ee8a48ef1c97a1bf6442c15484bbbd4669228a0f90242f4f9")
version("2.9.0", sha256="69f98ef58c818bb5410133e1891ac192653b0ec96eb9468590140f2552b6e5d1")
version("2.8.3", sha256="4906ab1899721c41dd918dddb039ba2848a1fb0cf84f3a563a1179b9d6ee0d9f")
version("2.8.2", sha256="9909f6409dc44b2c28c1fda0042dab4b711f25ec3277ef0cb6ffc40f5483910d")
@@ -211,6 +212,10 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
sha256="8221073d1b2f8944395a88a5d60a15c7370646b62f5fc6309867bbb6a8c2096c",
)
+ # cmake: find threads package first
+ # https://github.com/ornladios/ADIOS2/pull/3893
+ patch("2.9.2-cmake-find-threads-package-first.patch", when="@2.9.2:")
+
@when("%fj")
def patch(self):
"""add fujitsu mpi commands #16864"""