Accepting request 501736 from home:NMoreyChaisemartin:branches:science:HPC

- Add patch rdma-core-s390x.patch to fix s390x build (bsc#1043105).

OBS-URL: https://build.opensuse.org/request/show/501736
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=31
This commit is contained in:
Nicolas Morey-Chaisemartin 2017-06-07 13:21:44 +00:00 committed by Git OBS Bridge
parent 104579e432
commit d209db4b8b
3 changed files with 23 additions and 8 deletions

12
rdma-core-s390x.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git util/udma_barrier.h util/udma_barrier.h
index 9932a687..23acf233 100644
--- util/udma_barrier.h
+++ util/udma_barrier.h
@@ -192,6 +192,7 @@
#define mmio_flush_writes() asm volatile("dsb st" ::: "memory");
#elif defined(__sparc__) || defined(__s390x__)
#define mmio_flush_writes() asm volatile("" ::: "memory")
+#else
#error No architecture specific memory barrier defines found!
#endif

View File

@ -1,6 +1,7 @@
-------------------------------------------------------------------
Tue Jun 6 12:12:05 UTC 2017 - nmoreychaisemartin@suse.com
Wed Jun 7 13:02:09 UTC 2017 - nmoreychaisemartin@suse.com
- Add patch rdma-core-s390x.patch to fix s390x build (bsc#1043105).
- libibverbs1 requires libibverbs (bsc#1042840).
-------------------------------------------------------------------

View File

@ -46,6 +46,7 @@ Group: Productivity/Networking/Other
Url: https://github.com/linux-rdma/rdma-core
Source0: %{name}-%{version}%{git_ver}.tar.xz
Source1: baselibs.conf
Patch1: rdma-core-s390x.patch
BuildRequires: binutils
BuildRequires: cmake >= 2.8.11
BuildRequires: gcc
@ -104,7 +105,7 @@ Requires: %{ibcm_lname} = %{version}-%{release}
Requires: %{rdmacm_lname} = %{version}-%{release}
Requires: %{umad_lname} = %{version}-%{release}
Requires: %{verbs_lname} = %{version}-%{release}
%ifnarch s390 s390x armv7hl
%ifnarch s390 armv7hl
Requires: %{mlx5_lname} = %{version}-%{release}
%endif
Requires: rsocket = %{version}-%{release}
@ -153,7 +154,7 @@ Provides: libocrdma-rdmav2 = %{version}-%{release}
Obsoletes: libocrdma-rdmav2 < %{version}-%{release}
Provides: librxe-rdmav2 = %{version}-%{release}
Obsoletes: librxe-rdmav2 < %{version}-%{release}
%ifnarch s390 s390x armv7hl
%ifnarch s390 armv7hl
Requires: %{mlx5_lname} = %{version}-%{release}
%endif
@ -181,12 +182,12 @@ Device-specific plug-in ibverbs userspace drivers are included:
%package -n %verbs_lname
Summary: Ibverbs runtime library
Group: System/Libraries
Requires: libibverbs = %{version}-%{release}
Requires: libibverbs = %{version}
%description -n %verbs_lname
This package contains the ibverbs runtime library.
%ifnarch s390 s390x armv7hl
%ifnarch s390 armv7hl
%package -n %mlx5_lname
Summary: MLX5 runtime library
Group: System/Libraries
@ -297,6 +298,7 @@ on those changes.
%prep
%setup -q -n %{name}-%{version}%{git_ver}
%patch1
%build
@ -383,7 +385,7 @@ rm %{buildroot}%{_sbindir}/srp_daemon.sh
%post -n %verbs_lname -p /sbin/ldconfig
%postun -n %verbs_lname -p /sbin/ldconfig
%ifnarch s390 s390x armv7hl
%ifnarch s390 armv7hl
%post -n %mlx5_lname -p /sbin/ldconfig
%postun -n %mlx5_lname -p /sbin/ldconfig
%endif
@ -501,7 +503,7 @@ rm %{buildroot}%{_sbindir}/srp_daemon.sh
%{_mandir}/man3/umad*
%{_mandir}/man3/*_to_ibv_rate.*
%{_mandir}/man7/rdma_cm.*
%ifnarch s390 s390x armv7hl
%ifnarch s390 armv7hl
%{_mandir}/man3/mlx5*
%{_mandir}/man7/mlx5*
%endif
@ -522,7 +524,7 @@ rm %{buildroot}%{_sbindir}/srp_daemon.sh
%defattr(-,root,root)
%{_libdir}/libibverbs*.so.*
%ifnarch s390 s390x armv7hl
%ifnarch s390 armv7hl
%files -n %mlx5_lname
%defattr(-,root,root)
%{_libdir}/libmlx5*.so.*