From 13ba05d11b8bf8d62fac584d514f844b1bdb658e Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Wed, 8 Jun 2022 19:04:18 +0200
Subject: [PATCH] sys-cluster/mpi-benchmarks: fix build with mpich

Closes: https://bugs.gentoo.org/850334
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 .../files/mpi-benchmarks-2021.3-makefile.patch              | 2 +-
 sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/mpi-benchmarks/files/mpi-benchmarks-2021.3-makefile.patch b/sys-cluster/mpi-benchmarks/files/mpi-benchmarks-2021.3-makefile.patch
index 2ba8660e19..fbf00de646 100644
--- a/sys-cluster/mpi-benchmarks/files/mpi-benchmarks-2021.3-makefile.patch
+++ b/sys-cluster/mpi-benchmarks/files/mpi-benchmarks-2021.3-makefile.patch
@@ -116,7 +116,7 @@
 -$(BINARY): $(IMB_OBJ) $(BECHMARK_SUITE_OBJ) $(ADDITIONAL_OBJ) $(YAML_CPP_LIB)
 -	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 +$(BINARY): $(IMB_OBJ) $(BECHMARK_SUITE_OBJ) $(ADDITIONAL_OBJ)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIE -o $@ $^ $(LDFLAGS) $(YAML_CPP_LIB) -lmpi_cxx -lmpi
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIE -o $@ $^ $(LDFLAGS) $(YAML_CPP_LIB)
  
  %.o: %.cpp
 -	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
diff --git a/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild b/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild
index 44f0cf6178..3a98c36bc4 100644
--- a/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild
+++ b/sys-cluster/mpi-benchmarks/mpi-benchmarks-2021.3.ebuild
@@ -22,6 +22,12 @@ DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
+src_configure() {
+	export CC=mpicc
+	export CXX=mpicxx
+	default
+}
+
 src_install() {
 	dodoc ReadMe_IMB.txt README.md
 	dobin IMB-*