[gentoo-commits] proj/sci:master commit in: sys-cluster/mpe2/

[Justin Lecher]

commit:     94d627ca2faa885ee1d301e08231bc1a5042a567
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Nov 30 09:37:04 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Nov 30 09:37:04 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=94d627ca

sys-cluster/mpe2: Set MAKEOPTS (instead of emake -j1)

---
 sys-cluster/mpe2/mpe2-1.3.0.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-cluster/mpe2/mpe2-1.3.0.ebuild 
b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
index a1728a7..e96b358 100644
--- a/sys-cluster/mpe2/mpe2-1.3.0.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.3.0.ebuild
@@ -69,6 +69,10 @@ pkg_setup() {
 src_prepare() {
        # Don't assume path contains ./
        sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die
+
+       # No parallel make:
+       # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
+       MAKEOPTS+=" -j1"
 }
 
 src_configure() {
@@ -118,9 +122,7 @@ src_test() {
                return 0
        fi
 
-       # No parallel make:
-       # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
-       emake -j1 \
+       emake \
                CC="${S}"/bin/mpecc \
                FC="${S}"/bin/mpefc \
                MPERUN="${ROOT}/usr/bin/mpiexec -n 4" \
@@ -135,8 +137,6 @@ src_test() {
 }
 
 src_install() {
-       # No parallel make:
-       # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
-       emake -j1 DESTDIR="${D}" install || die
+       emake DESTDIR="${D}" install || die
        rm -f "${D}"/usr/sbin/mpeuninstall || die
 }