Accepting request 1232847 from science:HPC

OBS-URL: https://build.opensuse.org/request/show/1232847
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openmpi4?expand=0&rev=18

mtl-ofi-fix-missing-definition-of-container_of.patch

@@ -0,0 +1,24 @@
+commit 75b6dad5959ba75fcba8c64cc0a364d820e03ebc
+Author: Nicolas Morey <nmorey@suse.com>
+Date:   Fri Dec 20 12:44:38 2024 +0100
+
+    mtl: ofi: fix missing definition of container_of
+    
+    Signed-off-by: Nicolas Morey <nmorey@suse.com>
+
+diff --git ompi/mca/mtl/ofi/mtl_ofi_request.h ompi/mca/mtl/ofi/mtl_ofi_request.h
+index f68c2a91baa0..6d748fd59bdc 100644
+--- ompi/mca/mtl/ofi/mtl_ofi_request.h
++++ ompi/mca/mtl/ofi/mtl_ofi_request.h
+@@ -15,6 +15,11 @@
+ 
+ #include "mtl_ofi.h"
+ 
++#ifndef container_of
++#define container_of(ptr, type, field) \
++        ((type *) ((char *)ptr - offsetof(type, field)))
++#endif
++
+ #define TO_OFI_REQ(_ptr_ctx) \
+     container_of((_ptr_ctx), struct ompi_mtl_ofi_request_t, ctx)
+ 

openmpi4.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 20 11:46:32 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Add mtl-ofi-fix-missing-definition-of-container_of.patch to fix
+ compilation with libfabric >= 2.0 (jsc#PED-9661, jsc#PED-10668)
+
 -------------------------------------------------------------------
 Tue Nov 26 07:12:00 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
 

openmpi4.spec

@@ -148,6 +148,7 @@ Patch1:         orted-mpir-add-version-to-shared-library.patch
 Patch2:         btl-openib-Add-VF-support-for-ConnectX-4-5-and-6.patch
 Patch3:         openmpi4-C99.diff
 Patch4:         test-datatype-partial.c-fix-compiler-warnings.patch
+Patch5:         mtl-ofi-fix-missing-definition-of-container_of.patch
 Provides:       mpi
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf