From c98a0b95b7ba9ce6abe5d566adfdddc11b154e9d Mon Sep 17 00:00:00 2001 From: liu yinsi Date: Mon, 2 Aug 2021 07:42:13 +0000 Subject: [PATCH] fix multiple definition to support gcc 10 --- ...rt-libfabric-fix-multiple-definition.patch | 19 +++++++++++++++++++ libfabric.spec | 8 ++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 backport-libfabric-fix-multiple-definition.patch diff --git a/backport-libfabric-fix-multiple-definition.patch b/backport-libfabric-fix-multiple-definition.patch new file mode 100644 index 0000000..f58138f --- /dev/null +++ b/backport-libfabric-fix-multiple-definition.patch @@ -0,0 +1,19 @@ +--- a/prov/verbs/src/fi_verbs.h 2018-05-09 03:27:04.000000000 +0800 ++++ b/prov/verbs/src/fi_verbs.h 2021-08-04 17:37:52.143247627 +0800 +@@ -680,11 +680,11 @@ + int fi_ibv_dgram_av_open(struct fid_domain *domain_fid, struct fi_av_attr *attr, + struct fid_av **av_fid, void *context); + +-struct fi_ops_atomic fi_ibv_msg_ep_atomic_ops; +-struct fi_ops_cm fi_ibv_msg_ep_cm_ops; +-struct fi_ops_msg fi_ibv_msg_ep_msg_ops; +-struct fi_ops_rma fi_ibv_msg_ep_rma_ops; +-struct fi_ops_msg fi_ibv_msg_srq_ep_msg_ops; ++extern struct fi_ops_atomic fi_ibv_msg_ep_atomic_ops; ++extern struct fi_ops_cm fi_ibv_msg_ep_cm_ops; ++extern struct fi_ops_msg fi_ibv_msg_ep_msg_ops; ++extern struct fi_ops_rma fi_ibv_msg_ep_rma_ops; ++extern struct fi_ops_msg fi_ibv_msg_srq_ep_msg_ops; + + struct fi_ibv_connreq { + struct fid handle; diff --git a/libfabric.spec b/libfabric.spec index 5619d3b..a894599 100644 --- a/libfabric.spec +++ b/libfabric.spec @@ -1,10 +1,11 @@ Name: libfabric Version: 1.6.1 -Release: 3 +Release: 4 Summary: A core component of OpenFabric Interfaces License: BSD or GPLv2 URL: http://ofiwg.github.io/libfabric/ Source0: https://github.com/ofiwg/libfabric/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +Patch0001: backport-libfabric-fix-multiple-definition.patch BuildRequires: gcc libibverbs-devel libnl3-devel librdmacm-devel @@ -43,7 +44,7 @@ BuildArch: noarch This contains man files for the using of libfabric. %prep -%autosetup -p1 +%autosetup -n libfabric-%{version} -p1 %build @@ -75,5 +76,8 @@ This contains man files for the using of libfabric. %changelog +* Web Aug 04 2021 Liu Yinsi - 1.6.1-4 +- fix multiple definition to support gcc 10 + * Fri Nov 29 2019 huyan - 1.6.1-3 - Package Initialization -- Gitee