From 747de401be0500a76214a62e73c35ec0b194d51f Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Thu, 17 Jul 2025 14:34:28 +0200 Subject: [PATCH] OpenMPI 5.0.7 -> 5.0.8 --- .../scripts/stage1/install_openmpi.sh | 7 ++----- .../scripts/stage1/openmpi_PR13106.patch | 20 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete 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 3b18314716..8aea53d3f0 100755 --- a/tools/toolchain/scripts/stage1/install_openmpi.sh +++ b/tools/toolchain/scripts/stage1/install_openmpi.sh @@ -6,8 +6,8 @@ [ "${BASH_SOURCE[0]}" ] && SCRIPT_NAME="${BASH_SOURCE[0]}" || SCRIPT_NAME=$0 SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_NAME")/.." && pwd -P)" -openmpi_ver="5.0.7" -openmpi_sha256="119f2009936a403334d0df3c0d74d5595a32d99497f9b1d41e90019fee2fc2dd" +openmpi_ver="5.0.8" +openmpi_sha256="53131e1a57e7270f645707f8b0b65ba56048f5b5ac3f68faabed3eb0d710e449" openmpi_pkg="openmpi-${openmpi_ver}.tar.bz2" source "${SCRIPT_DIR}"/common_vars.sh @@ -56,9 +56,6 @@ case "${with_openmpi}" in 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 deleted file mode 100644 index f4d9497b73..0000000000 --- a/tools/toolchain/scripts/stage1/openmpi_PR13106.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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,