From c1093f37434ac9dcbb0c8b52054a1b25079932fb Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Thu, 1 May 2025 16:11:06 +0200 Subject: [PATCH] Add OpenMPI 5.0.7 patch for RHEL8 https://github.com/open-mpi/ompi/issues/13103 --- .../scripts/stage1/install_openmpi.sh | 4 ++++ .../scripts/stage1/openmpi_PR13106.patch | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 tools/toolchain/scripts/stage1/openmpi_PR13106.patch diff --git a/tools/toolchain/scripts/stage1/install_openmpi.sh b/tools/toolchain/scripts/stage1/install_openmpi.sh index 7dc8416666..3b18314716 100755 --- a/tools/toolchain/scripts/stage1/install_openmpi.sh +++ b/tools/toolchain/scripts/stage1/install_openmpi.sh @@ -55,6 +55,10 @@ case "${with_openmpi}" in CFLAGS="${CFLAGS} -fgnu89-inline" fi fi + + # Apply patch from PR13106 + patch -p1 oshmem/mca/sshmem/base/sshmem_base_open.c < ${SCRIPT_DIR}/stage1/openmpi_PR13106.patch + # We still require MPI-1.0-compatability for PTSCOTCH ./configure CFLAGS="${CFLAGS}" \ --prefix=${pkg_install_dir} \ diff --git a/tools/toolchain/scripts/stage1/openmpi_PR13106.patch b/tools/toolchain/scripts/stage1/openmpi_PR13106.patch new file mode 100644 index 0000000000..f4d9497b73 --- /dev/null +++ b/tools/toolchain/scripts/stage1/openmpi_PR13106.patch @@ -0,0 +1,20 @@ +--- a/oshmem/mca/sshmem/base/sshmem_base_open.c ++++ b/oshmem/mca/sshmem/base/sshmem_base_open.c +@@ -31,7 +31,7 @@ + * globals + */ + +-void *mca_sshmem_base_start_address = UINTPTR_MAX; ++void *mca_sshmem_base_start_address = (void*)UINTPTR_MAX; + + char * mca_sshmem_base_backing_file_dir = NULL; + +@@ -49,7 +49,7 @@ mca_sshmem_base_register (mca_base_register_flag_t flags) + "base", + "start_address", + "Specify base address for shared memory region", +- MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG, ++ MCA_BASE_VAR_TYPE_UNSIGNED_LONG, + NULL, + 0, + MCA_BASE_VAR_FLAG_SETTABLE,