From 8bb9e151cdc512a437d41fa746ae2de6aaf17a95 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <david.abdurachmanov@sifive.com>
Date: Thu, 16 Jan 2020 15:56:50 +0200
Subject: [PATCH] Fix merge

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
---
 openmpi.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/openmpi.spec b/openmpi.spec
index 925e499..b9e8a64 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -56,9 +56,14 @@ Source4:         macros.openmpi
 # fcoll/two_phase: fix error in calculating aggregators in 32bit mode
 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-gfortran
+%ifarch %{valgrind_arches}
 BuildRequires:   valgrind-devel
+%endif
 %if %{with rdma}
 BuildRequires:   opensm-devel > 3.3.0
 BuildRequires:   rdma-core-devel
@@ -97,11 +102,11 @@ BuildRequires:   zlib-devel
 BuildRequires:   rpm-mpi-hooks
 %endif
 
-BuildRequires:		automake
-BuildRequires:		autoconf
-BuildRequires:		libtool
-BuildRequires:		gettext
-BuildRequires:		perl-interpreter
+BuildRequires:   automake
+BuildRequires:   autoconf
+BuildRequires:   libtool
+BuildRequires:   gettext
+BuildRequires:   perl-interpreter
 
 Provides:        mpi
 %if 0%{?rhel}