From f5a84c9856888446e329dd36bff842e5a2db708c Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 17 Sep 2019 10:52:16 -0700 Subject: Added MPICH_SKIP_MPICXX and OMPI_SKIP_CXX to H5public.h to avoid inadvertant linking to the deprecated MPI C++ wrappers. Fixes HDFFV-10893. --- release_docs/RELEASE.txt | 13 +++++++++++++ src/H5public.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 7c09c2b..eb47648 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -808,6 +808,19 @@ Bug Fixes since HDF5-1.10.2 release (DER - 2018/02/26, HDFFV-10356) + - Inappropriate linking with deprecated MPI C++ libraries + + HDF5 does not define *_SKIP_MPICXX in the public headers, so applications + can inadvertently wind up linking to the deprecated MPI C++ wrappers. + + MPICH_SKIP_MPICXX and OMPI_SKIP_MPICXX have both been defined in H5public.h + so this should no longer be an issue. HDF5 makes no use of the deprecated + MPI C++ wrappers. + + (DER - 2019/09/17, HDFFV-10893) + + + Configuration ------------- - Applied patches to address Cywin build issues diff --git a/src/H5public.h b/src/H5public.h index a7e21f6..b79fcfb 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -57,6 +57,9 @@ # include #endif #ifdef H5_HAVE_PARALLEL +/* Don't link against MPI C++ bindings */ +# define MPICH_SKIP_MPICXX 1 +# define OMPI_SKIP_MPICXX 1 # include #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ # include -- cgit v0.12