From 7929bb20162a168d59121a997f5737ea9aa96dad Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 12 Apr 2016 08:20:01 -0600 Subject: [PATCH] Update to 1.3.0 --- .gitignore | 1 + 1844.patch | 35 ----------------------------------- libfabric.spec | 11 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 1844.patch diff --git a/.gitignore b/.gitignore index 12d162b..23cd5e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /libfabric-1.1.0.tar.bz2 /libfabric-1.2.0.tar.bz2 +/libfabric-1.3.0.tar.bz2 diff --git a/1844.patch b/1844.patch deleted file mode 100644 index f61d0b9..0000000 --- a/1844.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7d9ea39e4523fa362a447cd7942074b7dce28673 Mon Sep 17 00:00:00 2001 -From: Evgeny Leksikov -Date: Wed, 9 Mar 2016 21:29:37 +0300 -Subject: [PATCH] verbs/RDM: fix non-x86 build Signed-off-by:Evgeny Leksikov - - ---- - 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 - #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 */ - diff --git a/libfabric.spec b/libfabric.spec index 6313495..5438cb1 100644 --- a/libfabric.spec +++ b/libfabric.spec @@ -1,14 +1,11 @@ Name: libfabric -Version: 1.2.0 +Version: 1.3.0 Release: 1%{?dist} Summary: Open Fabric Interfaces License: BSD or GPLv2 URL: http://ofiwg.github.io/libfabric/ -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 +Source0: https://github.com/ofiwg/libfabric/releases/download/v%{version}/libfabric-%{version}.tar.bz2 BuildRequires: libibverbs-devel BuildRequires: libnl3-devel @@ -46,7 +43,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 %build @@ -82,6 +78,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %changelog +* Tue Apr 12 2016 Orion Poplawski - 1.3.0-1 +- Update to 1.3.0 + * Wed Mar 9 2016 Orion Poplawski - 1.2.0-1 - Update to 1.2.0 - Use psm/psm2 if possible on EL diff --git a/sources b/sources index 8462b6f..4730a45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4ccb6b3abc1a9c13e9ad066e6c14dc3 libfabric-1.2.0.tar.bz2 +fa678d57a93796a59f618a1cd79ac1a7 libfabric-1.3.0.tar.bz2