summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorKai Germaschewski <kai.germaschewski@unh.edu>2021-10-19 17:09:07 -0400
committerGitHub <noreply@github.com>2021-10-19 21:09:07 +0000
commit501fa6767b8d3b453a4fced361971c61ce6d33cd (patch)
tree6bd853a4db64cb63e81410f67dd48a15a48170e4 /var
parente7c7f44bb634c5cde0c6cb049bfde5e17b4d6dc1 (diff)
downloadspack-501fa6767b8d3b453a4fced361971c61ce6d33cd.tar.gz
spack-501fa6767b8d3b453a4fced361971c61ce6d33cd.tar.bz2
spack-501fa6767b8d3b453a4fced361971c61ce6d33cd.tar.xz
spack-501fa6767b8d3b453a4fced361971c61ce6d33cd.zip
adios2: fix unresolved symbols in 2.6.0 when built with gcc10 (#23871)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/adios2/2.6-fix-gcc10-symbols.patch32
-rw-r--r--var/spack/repos/builtin/packages/adios2/package.py4
2 files changed, 36 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/adios2/2.6-fix-gcc10-symbols.patch b/var/spack/repos/builtin/packages/adios2/2.6-fix-gcc10-symbols.patch
new file mode 100644
index 0000000000..70f2afb1d3
--- /dev/null
+++ b/var/spack/repos/builtin/packages/adios2/2.6-fix-gcc10-symbols.patch
@@ -0,0 +1,32 @@
+From 0ed2c03e407e6e6b501b00e7ce0b18f6a731ca6d Mon Sep 17 00:00:00 2001
+From: Kai Germaschewski <kai.germaschewski@unh.edu>
+Date: Mon, 24 May 2021 15:00:38 -0400
+Subject: [PATCH] fix unresolved symbol errors when compiling with gcc10
+
+---
+ .../toolkit/format/dataman/DataManSerializer.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/source/adios2/toolkit/format/dataman/DataManSerializer.cpp b/source/adios2/toolkit/format/dataman/DataManSerializer.cpp
+index 697d080ae..0ecca6b23 100644
+--- a/source/adios2/toolkit/format/dataman/DataManSerializer.cpp
++++ b/source/adios2/toolkit/format/dataman/DataManSerializer.cpp
+@@ -1143,5 +1143,15 @@ void DataManSerializer::Log(const int level, const std::string &message,
+ }
+ }
+
++#define declare_template_instantiation(T) \
++ template int DataManSerializer::GetData<T>( \
++ T * outputData, const std::string &varName, const Dims &varStart, \
++ const Dims &varCount, const size_t step, const Dims &varMemStart, \
++ const Dims &varMemCount);
++
++ADIOS2_FOREACH_PRIMITIVE_STDTYPE_1ARG(declare_template_instantiation)
++declare_template_instantiation(std::string)
++#undef declare_template_instantiation
++
+ } // namespace format
+ } // namespace adios2
+--
+2.32.0.rc3
+
diff --git a/var/spack/repos/builtin/packages/adios2/package.py b/var/spack/repos/builtin/packages/adios2/package.py
index f3b28168cb..e6165f43b6 100644
--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -125,6 +125,10 @@ class Adios2(CMakePackage):
# See https://github.com/ornladios/ADIOS2/pull/2596
patch('2.7-fix-python-test-deps.patch', when='@2.5.0:2.7.0')
+ # Fix unresolved symbols when built with gcc10.
+ # See https://github.com/ornladios/ADIOS2/pull/2714
+ patch('2.6-fix-gcc10-symbols.patch', when='@2.6.0')
+
@when('%fj')
def patch(self):
""" add fujitsu mpi commands #16864 """