public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
Date: Fri, 11 Jun 2021 00:29:23 +0000 (UTC)	[thread overview]
Message-ID: <1623371348.c4939084a1c018e5e50c7b91fdc899093227a7df.sam@gentoo> (raw)

commit:     c4939084a1c018e5e50c7b91fdc899093227a7df
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 00:13:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 00:29:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4939084

sys-cluster/mpe2: fix VariableScope (ROOT)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
index fe48a351a0c..71802728bcb 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -123,7 +123,7 @@ src_test() {
 		echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf || die
 		chmod 600 "${T}"/mpd.conf || die
 		export MPD_CONF_FILE="${T}/mpd.conf"
-		"${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die
+		"${EPREFIX%/}"/usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die
 	elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
 		echo
 		einfo "Skipping tests for openmpi"
@@ -136,12 +136,12 @@ src_test() {
 	emake -j1 \
 		CC="${S}"/bin/mpecc \
 		FC="${S}"/bin/mpefc \
-		MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \
+		MPERUN="${EPREFIX%/}/usr/bin/mpiexec -n 4" \
 		CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \
 		check;
 		rc=${?}
 	if [[ "${MPE_IMP}" == mpich2 ]]; then
-		"${ROOT}"usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
+		"${EPREFIX%/}"/usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
 	fi
 
 	return ${rc}


             reply	other threads:[~2021-06-11  0:29 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-11  0:29 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-06-01 23:06 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/ Justin Bronder
2016-01-06 15:07 Justin Lecher
2016-01-06 13:34 Agostino Sarubbo
2015-12-29 11:04 Agostino Sarubbo
2015-12-29 10:02 Justin Lecher
2015-12-29 10:02 Justin Lecher
2015-10-19  6:56 Patrice Clement

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=1623371348.c4939084a1c018e5e50c7b91fdc899093227a7df.sam@gentoo \
    --to=sam@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