From b7d72e26bb5dae2517d1b91030269144833a6e94 Mon Sep 17 00:00:00 2001 From: Severin Strobl Date: Wed, 7 Apr 2021 11:55:24 +0200 Subject: otf2: patch for uninitialized variable (#22719) As pointed out in https://github.com/STEllAR-GROUP/hpx/issues/5239, there is an issues in OTF2 <=2.2 where a variable is not properly initialized. As currently no release of OTF2 is available fixing this, the patch should be applied. --- .../repos/builtin/packages/otf2/collective_callbacks.patch | 13 +++++++++++++ var/spack/repos/builtin/packages/otf2/package.py | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 var/spack/repos/builtin/packages/otf2/collective_callbacks.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/otf2/collective_callbacks.patch b/var/spack/repos/builtin/packages/otf2/collective_callbacks.patch new file mode 100644 index 0000000000..daa07d84cb --- /dev/null +++ b/var/spack/repos/builtin/packages/otf2/collective_callbacks.patch @@ -0,0 +1,13 @@ +diff --git a/src/otf2_archive_int.c b/src/otf2_archive_int.c +index db9b7a9..68f1694 100644 +--- a/src/otf2_archive_int.c ++++ b/src/otf2_archive_int.c +@@ -1083,7 +1083,7 @@ otf2_archive_set_collective_callbacks( OTF2_Archive* archive, + archive->global_comm_context = globalCommContext; + archive->local_comm_context = localCommContext; + +- OTF2_ErrorCode status; ++ OTF2_ErrorCode status = OTF2_SUCCESS; + + /* It is time to create the directories by the root rank. */ + if ( archive->file_mode == OTF2_FILEMODE_WRITE ) diff --git a/var/spack/repos/builtin/packages/otf2/package.py b/var/spack/repos/builtin/packages/otf2/package.py index c12c1fd352..78a384d792 100644 --- a/var/spack/repos/builtin/packages/otf2/package.py +++ b/var/spack/repos/builtin/packages/otf2/package.py @@ -24,6 +24,10 @@ class Otf2(AutotoolsPackage): version('1.3.1', sha256='c4605ace845d89fb1a19223137b92cc503b01e3db5eda8c9e0715d0cfcf2e4b9') version('1.2.1', sha256='1db9fb0789de4a9c3c96042495e4212a22cb581f734a1593813adaf84f2288e4') + # Fix missing initialization of variable resulting in issues when used by + # APEX/HPX: https://github.com/STEllAR-GROUP/hpx/issues/5239 + patch('collective_callbacks.patch', when='@2.1:2.2') + def configure_args(self): return [ '--enable-shared', -- cgit v1.2.3-70-g09d2