summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Wibking <ben@wibking.com>2023-12-19 11:58:05 -0500
committerGitHub <noreply@github.com>2023-12-19 17:58:05 +0100
commitf245bde77255eecb718f42ad547fabb92db7894a (patch)
tree86f49e9013d90e78914e080f547bc900914f631c
parent4aee067bb0fb212aa124c181b5539d0c1488e1f5 (diff)
downloadspack-f245bde77255eecb718f42ad547fabb92db7894a.tar.gz
spack-f245bde77255eecb718f42ad547fabb92db7894a.tar.bz2
spack-f245bde77255eecb718f42ad547fabb92db7894a.tar.xz
spack-f245bde77255eecb718f42ad547fabb92db7894a.zip
adios2: fix build failure in 2.7.1 (#41753)
-rw-r--r--var/spack/repos/builtin/packages/adios2/2.7.1-fix-broken-endian-reverse-compile.patch23
-rw-r--r--var/spack/repos/builtin/packages/adios2/package.py4
2 files changed, 27 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/adios2/2.7.1-fix-broken-endian-reverse-compile.patch b/var/spack/repos/builtin/packages/adios2/2.7.1-fix-broken-endian-reverse-compile.patch
new file mode 100644
index 0000000000..01586c734a
--- /dev/null
+++ b/var/spack/repos/builtin/packages/adios2/2.7.1-fix-broken-endian-reverse-compile.patch
@@ -0,0 +1,23 @@
+From 5aed0d5c3ecb7afbd56a786243b2bc8811e0fbdd Mon Sep 17 00:00:00 2001
+From: Axel Huebl <axel.huebl@plasma.ninja>
+Date: Fri, 14 May 2021 18:22:19 -0700
+Subject: [PATCH] Fix Broken Endinage Reverse Compile
+
+Add right type in comparison.
+---
+ source/adios2/helper/adiosMemory.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/adios2/helper/adiosMemory.cpp b/source/adios2/helper/adiosMemory.cpp
+index c3a4246a91..3bf8c89adc 100644
+--- a/source/adios2/helper/adiosMemory.cpp
++++ b/source/adios2/helper/adiosMemory.cpp
+@@ -29,7 +29,7 @@ void CopyPayloadStride(const char *src, const size_t payloadStride, char *dest,
+ #ifdef ADIOS2_HAVE_ENDIAN_REVERSE
+ if (endianReverse)
+ {
+- if (destType == "")
++ if (destType == DataType::None)
+ {
+ }
+ #define declare_type(T) \
diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
index 4a038ddcac..2e4a9480f5 100644
--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -212,6 +212,10 @@ class Adios2(CMakePackage, CudaPackage, ROCmPackage):
sha256="8221073d1b2f8944395a88a5d60a15c7370646b62f5fc6309867bbb6a8c2096c",
)
+ # Fix mismatched datatypes in comparison
+ # See https://github.com/ornladios/ADIOS2/pull/2701
+ patch("2.7.1-fix-broken-endian-reverse-compile.patch", when="@2.7.1")
+
# 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:")