diff --git a/packages/openmpi/build.sh b/packages/openmpi/build.sh index df08dce38..3692dd401 100644 --- a/packages/openmpi/build.sh +++ b/packages/openmpi/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.open-mpi.org TERMUX_PKG_DESCRIPTION="Open source Message Passing Interface implementation" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91" -TERMUX_PKG_VERSION=4.0.5 +TERMUX_PKG_VERSION=4.1.0 TERMUX_PKG_SRCURL=https://download.open-mpi.org/release/open-mpi/v${TERMUX_PKG_VERSION:0:3}/openmpi-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=572e777441fd47d7f06f1b8a166e7f44b8ea01b8b2e79d1e299d509725d1bd05 +TERMUX_PKG_SHA256=228467c3dd15339d9b26cf26a291af3ee7c770699c5e8a1b3ad786f9ae78140a TERMUX_PKG_DEPENDS="libandroid-shmem" TERMUX_PKG_BREAKS="openmpi-dev" TERMUX_PKG_REPLACES="openmpi-dev" diff --git a/packages/openmpi/opal-mca-memory-patcher-memory_patcher_component.c.patch b/packages/openmpi/opal-mca-memory-patcher-memory_patcher_component.c.patch index 231861b74..8ecd924a2 100644 --- a/packages/openmpi/opal-mca-memory-patcher-memory_patcher_component.c.patch +++ b/packages/openmpi/opal-mca-memory-patcher-memory_patcher_component.c.patch @@ -1,20 +1,8 @@ ---- ./opal/mca/memory/patcher/memory_patcher_component.c.orig 2020-06-10 21:35:37.000000000 +0000 -+++ ./opal/mca/memory/patcher/memory_patcher_component.c 2020-07-04 10:42:40.459784443 +0000 -@@ -250,9 +250,9 @@ - advice == MADV_FREE || - #endif - #ifdef MADV_REMOVE -- advice == MADV_REMOVE || -+ advice == MADV_REMOVE - #endif -- advice == POSIX_MADV_DONTNEED) -+ ) - { - opal_mem_hooks_release_hook (start, length, false); - } -@@ -346,10 +346,17 @@ - #define IPCOP_shmdt 22 - #endif +--- ./opal/mca/memory/patcher/memory_patcher_component.c.orig 2020-12-18 20:44:38.000000000 +0000 ++++ ./opal/mca/memory/patcher/memory_patcher_component.c 2021-01-14 20:52:10.545290518 +0000 +@@ -55,10 +55,17 @@ + #include "memory_patcher.h" + #undef opal_memory_changed -#define HAS_SHMDT (defined(SYS_shmdt) || \ - (defined(IPCOP_shmdt) && defined(SYS_ipc))) @@ -32,9 +20,21 @@ +# define HAS_SHMAT 0 +#endif - #if (HAS_SHMDT || HAS_SHMAT) && defined(__linux__) - -@@ -444,8 +447,8 @@ + static int patcher_open(void); + static int patcher_close(void); +@@ -281,9 +288,9 @@ + advice == MADV_FREE || + #endif + #ifdef MADV_REMOVE +- advice == MADV_REMOVE || ++ advice == MADV_REMOVE + #endif +- advice == POSIX_MADV_DONTNEED) ++ ) + { + opal_mem_hooks_release_hook (start, length, false); + } +@@ -473,8 +480,8 @@ uintptr_t attach_addr = (uintptr_t)shmaddr; if (shmflg & SHM_RND) { @@ -45,7 +45,7 @@ } opal_mem_hooks_release_hook ((void*)attach_addr, size, false); } -@@ -457,7 +460,7 @@ +@@ -486,7 +493,7 @@ unsigned long ret; ret = memory_patcher_syscall(SYS_ipc, IPCOP_shmat, shmid, shmflg, &shmaddr, shmaddr);