public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/mpi-benchmarks/files/, sys-cluster/mpi-benchmarks/
Date: Fri, 10 Jun 2022 14:08:01 +0000 (UTC)	[thread overview]
Message-ID: <1654833484.13ba05d11b8bf8d62fac584d514f844b1bdb658e.andrewammerlaan@gentoo> (raw)

commit:     13ba05d11b8bf8d62fac584d514f844b1bdb658e
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Jun  8 17:04:18 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 03:58:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13ba05d1

sys-cluster/mpi-benchmarks: fix build with mpich

Closes: https://bugs.gentoo.org/850334
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 .../mpi-benchmarks/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 2ba8660e1..fbf00de64 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 44f0cf617..3a98c36bc 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-*


             reply	other threads:[~2022-06-10 14:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-10 14:08 Andrew Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-03 10:44 [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/mpi-benchmarks/files/, sys-cluster/mpi-benchmarks/ Florian Schmaus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1654833484.13ba05d11b8bf8d62fac584d514f844b1bdb658e.andrewammerlaan@gentoo \
    --to=andrewammerlaan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox