rpms/libfabric
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Add upstream patch to fix non-x86 builds

Browse Source 
- psm/psm2 only available for x86_64 on EL
This commit is contained in:
Orion Poplawski 2016-03-09 14:14:01 -07:00
parent 16d3653a77
commit d3ffefb68a
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
1844.patch Normal file
View File

@ -0,0 +1,35 @@
From 7d9ea39e4523fa362a447cd7942074b7dce28673 Mon Sep 17 00:00:00 2001
From: Evgeny Leksikov <evgeny.leksikov@intel.com>
Date: Wed, 9 Mar 2016 21:29:37 +0300
Subject: [PATCH] verbs/RDM: fix non-x86 build Signed-off-by:Evgeny Leksikov
<evgeny.leksikov@intel.com>
---
prov/verbs/src/ep_rdm/verbs_utils.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/prov/verbs/src/ep_rdm/verbs_utils.h b/prov/verbs/src/ep_rdm/verbs_utils.h
index 49ffc06..95790e3 100644
--- a/prov/verbs/src/ep_rdm/verbs_utils.h
+++ b/prov/verbs/src/ep_rdm/verbs_utils.h
@@ -45,15 +45,16 @@
#include <rdma/fi_log.h>
#include "../fi_verbs.h"
-#if defined(__ICC) || defined(__INTEL_COMPILER) || \
- defined(__GNUC__) || defined(__GNUG__)
+#if (defined(__ICC) || defined(__INTEL_COMPILER) || \
+ defined(__GNUC__) || defined(__GNUG__)) && \
+ defined(__x86_64__)
#include "xmmintrin.h"
#define FI_IBV_PREFETCH_ADDR(_addr) { \
_mm_prefetch((const char *)(_addr), _MM_HINT_T0);\
}
-#else /* ICC || GCC */
+#else /* ICC || GCC && x86_64 */
#define FI_IBV_PREFETCH_ADDR(_addr)
-#endif /* ICC || GCC */
+#endif /* ICC || GCC && x86_64 */
/* TODO: Merge anything useful into verbs_rdm.h */

13
libfabric.spec
View File

@ -6,16 +6,21 @@ Summary: Open Fabric Interfaces
License: BSD or GPLv2 License: BSD or GPLv2
URL: http://ofiwg.github.io/libfabric/ URL: http://ofiwg.github.io/libfabric/
Source0: http://downloads.openfabrics.org/downloads/ofi/libfabric-%{version}.tar.bz2 Source0: http://downloads.openfabrics.org/downloads/ofi/libfabric-%{version}.tar.bz2
# Fix non-x86 builds
# https://github.com/ofiwg/libfabric/issues/1842
Patch0: https://patch-diff.githubusercontent.com/raw/ofiwg/libfabric/pull/1844.patch
BuildRequires: libibverbs-devel
BuildRequires: libnl3-devel
BuildRequires: librdmacm-devel
%ifarch x86_64
%if 0%{?rhel} >= 6 %if 0%{?rhel} >= 6
BuildRequires: infinipath-psm-devel BuildRequires: infinipath-psm-devel
%endif %endif
BuildRequires: libibverbs-devel
BuildRequires: libnl3-devel
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
BuildRequires: libpsm2-devel BuildRequires: libpsm2-devel
%endif %endif
BuildRequires: librdmacm-devel %endif
%description %description
OpenFabrics Interfaces (OFI) is a framework focused on exporting fabric OpenFabrics Interfaces (OFI) is a framework focused on exporting fabric
@ -41,6 +46,7 @@ developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
@ -79,6 +85,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
* Wed Mar 9 2016 Orion Poplawski <orion@cora.nwra.com> - 1.2.0-1 * Wed Mar 9 2016 Orion Poplawski <orion@cora.nwra.com> - 1.2.0-1
- Update to 1.2.0 - Update to 1.2.0
- Use psm/psm2 if possible on EL - Use psm/psm2 if possible on EL
- Add upstream patch to fix non-x86 builds
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild