Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
Date: Fri, 11 Jun 2021 00:29:28
Message-Id: 1623371348.c4939084a1c018e5e50c7b91fdc899093227a7df.sam@gentoo
1 commit: c4939084a1c018e5e50c7b91fdc899093227a7df
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jun 11 00:13:27 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jun 11 00:29:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4939084
7
8 sys-cluster/mpe2: fix VariableScope (ROOT)
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
16 index fe48a351a0c..71802728bcb 100644
17 --- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
18 +++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
19 @@ -123,7 +123,7 @@ src_test() {
20 echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf || die
21 chmod 600 "${T}"/mpd.conf || die
22 export MPD_CONF_FILE="${T}/mpd.conf"
23 - "${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die
24 + "${EPREFIX%/}"/usr/bin/mpd -d --pidfile="${T}"/mpd.pid || die
25 elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
26 echo
27 einfo "Skipping tests for openmpi"
28 @@ -136,12 +136,12 @@ src_test() {
29 emake -j1 \
30 CC="${S}"/bin/mpecc \
31 FC="${S}"/bin/mpefc \
32 - MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \
33 + MPERUN="${EPREFIX%/}/usr/bin/mpiexec -n 4" \
34 CLOG2TOSLOG2="${S}/src/slog2sdk/bin/clog2TOslog2" \
35 check;
36 rc=${?}
37 if [[ "${MPE_IMP}" == mpich2 ]]; then
38 - "${ROOT}"usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
39 + "${EPREFIX%/}"/usr/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
40 fi
41
42 return ${rc}