Fix merge

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
David Abdurachmanov 2020-01-16 15:56:50 +02:00
parent 4072d90d42
commit 8bb9e151cd
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB

View File

@ -56,9 +56,14 @@ Source4: macros.openmpi
# fcoll/two_phase: fix error in calculating aggregators in 32bit mode # fcoll/two_phase: fix error in calculating aggregators in 32bit mode
Patch0: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/7126.patch Patch0: https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/7126.patch
# Add support for riscv64
Patch10: openmpi-4.0.1-riscv64.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
%ifarch %{valgrind_arches}
BuildRequires: valgrind-devel BuildRequires: valgrind-devel
%endif
%if %{with rdma} %if %{with rdma}
BuildRequires: opensm-devel > 3.3.0 BuildRequires: opensm-devel > 3.3.0
BuildRequires: rdma-core-devel BuildRequires: rdma-core-devel
@ -97,11 +102,11 @@ BuildRequires: zlib-devel
BuildRequires: rpm-mpi-hooks BuildRequires: rpm-mpi-hooks
%endif %endif
BuildRequires: automake BuildRequires: automake
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: libtool BuildRequires: libtool
BuildRequires: gettext BuildRequires: gettext
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
Provides: mpi Provides: mpi
%if 0%{?rhel} %if 0%{?rhel}