* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
@ 2021-06-11 0:29 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-06-11 0:29 UTC (permalink / raw
To: gentoo-commits
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}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
@ 2016-06-01 23:06 Justin Bronder
0 siblings, 0 replies; 8+ messages in thread
From: Justin Bronder @ 2016-06-01 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 328cfdc7f8932e462b675147d0df2d13dbb57e57
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 23:05:13 2016 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 23:05:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=328cfdc7
sys-cluster/mpe2: dropping jsbronder as maintainer
Package-Manager: portage-2.2.26
sys-cluster/mpe2/metadata.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml
index c6c437f..8bf4b5f 100644
--- a/sys-cluster/mpe2/metadata.xml
+++ b/sys-cluster/mpe2/metadata.xml
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>jsbronder@gentoo.org</email>
- <name>Justin Bronder</name>
- </maintainer>
-<maintainer type="project">
+ <maintainer type="project">
<email>cluster@gentoo.org</email>
<name>Gentoo Cluster Project</name>
</maintainer>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
@ 2016-01-06 15:07 Justin Lecher
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2016-01-06 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 4de4adf0420fca4d70fba4a2d5d5b7f8e4974789
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 14:48:20 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 15:07:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de4adf0
sys-cluster/mpe2: Drop old
obsoletes:
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=450942
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=478562
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild | 144 -------------------------------
sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 3 +-
sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild | 142 ------------------------------
3 files changed, 2 insertions(+), 287 deletions(-)
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild
deleted file mode 100644
index 9ae1133..0000000
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 java-utils-2 toolchain-funcs
-
-MY_P=${P/_/}
-DESCRIPTION="MPI development tools"
-HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
-
-LICENSE="mpich2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal fortran threads debug"
-
-COMMON_DEPEND="!minimal? ( x11-libs/libXtst
- x11-libs/libXi )
- || ( sys-cluster/openmpi[fortran?,threads?]
- sys-cluster/mpich2[fortran?,threads?] )"
-
-DEPEND="!minimal? ( >=virtual/jdk-1.4 )
- ${COMMON_DEPEND}"
-
-RDEPEND="
-!minimal? ( >=virtual/jre-1.4 )
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-MPE_IMP=""
-
-# README:
-# This ebuild is created to handle building with both mpich2 and openmpi.
-# However, without empi (in the science overlay), and some further
-# conversion to use mpi.eclass, we can only handle one implementation
-# at a time. I still believe it's better to have the ebuild setup
-# correctly in preperation.
-
-pkg_setup() {
- fortran-2_pkg_setup
- local i
-
- if has_version sys-cluster/openmpi; then
- MPE_IMP=openmpi
- elif has_version sys-cluster/mpich2; then
- MPE_IMP=mpich2
- else
- die "Unknown MPI implementation"
- fi
-
- export JFLAGS="${JFLAGS} $(java-pkg_javac-args)"
-
- if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
- echo
- elog "Currently src_test fails on collchk with openmpi, hence"
- elog "testing is disabled by default. If you would like to"
- elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1"
- elog "to your environment."
- echo
- fi
-
- einfo "Building with support for: sys-cluster/${MPE_IMP}"
-}
-
-src_prepare() {
- # Don't assume path contains ./
- sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in
- epatch "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch
- epatch "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch
-}
-
-src_configure() {
- local c="--with-mpicc=/usr/bin/mpicc"
-
- if use fortran; then
- c="${c} --with-mpif77=/usr/bin/mpif77"
- else
- c="${c} --disable-f77"
- fi
-
- if use minimal; then
- c="${c} --enable-slog2=no --disable-rlog --disable-sample"
- else
- c="${c} --with-java2=$(java-config --jdk-home) --enable-slog2=build"
- fi
-
- if [[ "${MPE_IMP}" == openmpi ]]; then
- c="${c} --disable-rlog --disable-sample"
- fi
-
- econf ${c} \
- --sysconfdir=/etc/${PN} \
- --datadir=/usr/share/${PN} \
- --with-htmldir=/usr/share/${PN} \
- --with-docdir=/usr/share/${PN} \
- --enable-collchk \
- --enable-wrappers \
- $(use_enable !minimal graphics) \
- $(use_enable threads threadlogging) \
- $(use_enable debug g)
-}
-
-src_test() {
- local rc
-
- cd "${S}"
- if [[ "${MPE_IMP}" == mpich2 ]]; then
- echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf
- chmod 600 "${T}"/mpd.conf
- export MPD_CONF_FILE="${T}/mpd.conf"
- "${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid
- elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
- elog
- elog "Skipping tests for openmpi"
- elog
- return 0
- fi
-
- # No parallel make:
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
- emake -j1 \
- CC="${S}"/bin/mpecc \
- FC="${S}"/bin/mpefc \
- MPERUN="${ROOT}/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)
- fi
-
- return ${rc}
-}
-
-src_install() {
- # No parallel make:
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
- emake -j1 DESTDIR="${D}" install || die
- rm -f "${D}"/usr/sbin/mpeuninstall || die
-}
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 32ee5fe..a0043d8 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -154,4 +154,5 @@ src_install() {
MAKEOPTS+=" -j1"
default
rm -f "${ED}"/usr/sbin/mpeuninstall || die
+ rm -f "${ED}"/usr/bin/*.in || die
}
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
deleted file mode 100644
index 76d6bf0..0000000
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 java-utils-2 toolchain-funcs
-
-MY_P=${P/_/}
-DESCRIPTION="MPI development tools"
-HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm"
-SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
-
-LICENSE="mpich2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="minimal fortran threads debug"
-
-COMMON_DEPEND="!minimal? ( x11-libs/libXtst
- x11-libs/libXi )
- || ( sys-cluster/openmpi[fortran?,threads?]
- sys-cluster/mpich2[fortran?,threads?] )"
-
-DEPEND="!minimal? ( >=virtual/jdk-1.4 )
- ${COMMON_DEPEND}"
-
-RDEPEND="
-!minimal? ( >=virtual/jre-1.4 )
- ${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-MPE_IMP=""
-
-# README:
-# This ebuild is created to handle building with both mpich2 and openmpi.
-# However, without empi (in the science overlay), and some further
-# conversion to use mpi.eclass, we can only handle one implementation
-# at a time. I still believe it's better to have the ebuild setup
-# correctly in preperation.
-
-pkg_setup() {
- fortran-2_pkg_setup
- local i
-
- if has_version sys-cluster/openmpi; then
- MPE_IMP=openmpi
- elif has_version sys-cluster/mpich2; then
- MPE_IMP=mpich2
- else
- die "Unknown MPI implementation"
- fi
-
- export JFLAGS="${JFLAGS} $(java-pkg_javac-args)"
-
- if [[ "${MPE_IMP}" == openmpi ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
- echo ""
- elog "Currently src_test fails on collchk with openmpi, hence"
- elog "testing is disabled by default. If you would like to"
- elog "force testing, please add MPE_FORCE_OPENMPI_TEST=1"
- elog "to your environment."
- echo ""
- fi
-
- einfo "Building with support for: sys-cluster/${MPE_IMP}"
-}
-
-src_prepare() {
- # Don't assume path contains ./
- sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in
-}
-
-src_configure() {
- local c="--with-mpicc=/usr/bin/mpicc"
-
- if use fortran; then
- c="${c} --with-mpif77=/usr/bin/mpif77"
- else
- c="${c} --disable-f77"
- fi
-
- if use minimal; then
- c="${c} --enable-slog2=no --disable-rlog --disable-sample"
- else
- c="${c} --with-java2=$(java-config --jdk-home) --enable-slog2=build"
- fi
-
- if [[ "${MPE_IMP}" == openmpi ]]; then
- c="${c} --disable-rlog --disable-sample"
- fi
-
- econf ${c} \
- --sysconfdir=/etc/${PN} \
- --datadir=/usr/share/${PN} \
- --with-htmldir=/usr/share/${PN} \
- --with-docdir=/usr/share/${PN} \
- --enable-collchk \
- --enable-wrappers \
- $(use_enable !minimal graphics) \
- $(use_enable threads threadlogging) \
- $(use_enable debug g)
-}
-
-src_test() {
- local rc
-
- cd "${S}"
- if [[ "${MPE_IMP}" == mpich2 ]]; then
- echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf
- chmod 600 "${T}"/mpd.conf
- export MPD_CONF_FILE="${T}/mpd.conf"
- "${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid
- elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
- echo
- elog "Skipping tests for openmpi"
- echo
- return 0
- fi
-
- # No parallel make:
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
- emake -j1 \
- CC="${S}"/bin/mpecc \
- FC="${S}"/bin/mpefc \
- MPERUN="${ROOT}/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)
- fi
-
- return ${rc}
-}
-
-src_install() {
- # No parallel make:
- # http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
- emake -j1 DESTDIR="${D}" install || die
- rm -f "${D}"/usr/sbin/mpeuninstall || die
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
@ 2016-01-06 13:34 Agostino Sarubbo
0 siblings, 0 replies; 8+ messages in thread
From: Agostino Sarubbo @ 2016-01-06 13:34 UTC (permalink / raw
To: gentoo-commits
commit: 4dc3b4e818fe11bacce2353f692a747e6f99e3e9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 13:32:41 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 13:32:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc3b4e8
sys-cluster/mpe2: x86 stable wrt bug #570080
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 94ec0e9..32ee5fe 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
LICENSE="mpich2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug minimal fortran threads"
COMMON_DEPEND="
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
@ 2015-12-29 11:04 Agostino Sarubbo
0 siblings, 0 replies; 8+ messages in thread
From: Agostino Sarubbo @ 2015-12-29 11:04 UTC (permalink / raw
To: gentoo-commits
commit: bbf8ea1d44ea546b039345299e84e42ec37ea417
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 11:03:34 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 11:03:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf8ea1d
sys-cluster/mpe2: amd64 stable wrt bug #570080
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 4a80f4a..94ec0e9 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
LICENSE="mpich2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="debug minimal fortran threads"
COMMON_DEPEND="
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
@ 2015-12-29 10:02 Justin Lecher
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2015-12-29 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 95fcaf6d3573b7391c2218282f0705ea80fc338f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 10:00:42 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 10:01:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fcaf6d
sys-cluster/mpe2: QA work
* missing die
* ebuild code formating
* sort IUSE
* use default()
Package-Manager: portage-2.2.26
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 67 +++++++++++++++++---------------
1 file changed, 36 insertions(+), 31 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 8c657851..4a80f4a 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -9,6 +9,7 @@ FORTRAN_NEEDED=fortran
inherit eutils fortran-2 java-pkg-opt-2 toolchain-funcs
MY_P=${P/_/}
+
DESCRIPTION="MPI development tools"
HOMEPAGE="http://www-unix.mcs.anl.gov/perfvis/download/index.htm"
SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
@@ -16,18 +17,24 @@ SRC_URI="ftp://ftp.mcs.anl.gov/pub/mpi/${PN%2}/${MY_P}.tar.gz"
LICENSE="mpich2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="minimal fortran threads debug"
-
-COMMON_DEPEND="!minimal? ( x11-libs/libXtst
- x11-libs/libXi )
- || ( sys-cluster/openmpi[fortran?,threads?]
- sys-cluster/mpich2[fortran?,threads?] )"
-
-DEPEND="!minimal? ( >=virtual/jdk-1.6 )
+IUSE="debug minimal fortran threads"
+
+COMMON_DEPEND="
+ !minimal? (
+ x11-libs/libXtst
+ x11-libs/libXi
+ )
+ || (
+ sys-cluster/openmpi[fortran?,threads?]
+ sys-cluster/mpich2[fortran?,threads?]
+ )"
+
+DEPEND="
+ !minimal? ( >=virtual/jdk-1.6 )
${COMMON_DEPEND}"
RDEPEND="
-!minimal? ( >=virtual/jre-1.6 )
+ !minimal? ( >=virtual/jre-1.6 )
${COMMON_DEPEND}"
S="${WORKDIR}"/${MY_P}
@@ -48,6 +55,8 @@ pkg_setup() {
MPE_IMP=openmpi
elif has_version sys-cluster/mpich2; then
MPE_IMP=mpich2
+ elif has_version sys-cluster/mpich; then
+ MPE_IMP=mpich2
else
die "Unknown MPI implementation"
fi
@@ -65,40 +74,35 @@ pkg_setup() {
einfo "Building with support for: sys-cluster/${MPE_IMP}"
- if ! use minimal; then
- java-pkg-opt-2_pkg_setup
- fi
+ use minimal || java-pkg-opt-2_pkg_setup
}
src_prepare() {
# Don't assume path contains ./
- sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in
- epatch "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch
- epatch "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch
+ sed -i 's,\($MPERUN\) $pgm,\1 ./$pgm,' sbin/mpetestexeclog.in || die
+ epatch \
+ "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch \
+ "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch
- if ! use minimal; then
- java-pkg-opt-2_src_prepare
- fi
+ use minimal || java-pkg-opt-2_src_prepare
}
src_configure() {
local c="--with-mpicc=/usr/bin/mpicc"
if use fortran; then
- c="${c} --with-mpif77=/usr/bin/mpif77"
+ c+=" --with-mpif77=/usr/bin/mpif77"
else
- c="${c} --disable-f77"
+ c+=" --disable-f77"
fi
if use minimal; then
- c="${c} --enable-slog2=no --disable-rlog --disable-sample"
+ c+=" --enable-slog2=no --disable-rlog --disable-sample"
else
- c="${c} --with-java2=$(java-config --jdk-home) --enable-slog2=build"
+ c+=" --with-java2=$(java-config --jdk-home) --enable-slog2=build"
fi
- if [[ "${MPE_IMP}" == openmpi ]]; then
- c="${c} --disable-rlog --disable-sample"
- fi
+ [[ "${MPE_IMP}" == openmpi ]] && c+=" --disable-rlog --disable-sample"
econf ${c} \
--sysconfdir=/etc/${PN} \
@@ -115,12 +119,12 @@ src_configure() {
src_test() {
local rc
- cd "${S}"
+ cd "${S}" || die
if [[ "${MPE_IMP}" == mpich2 ]]; then
- echo "MPD_SECRETWORD=junk" > "${T}"/mpd.conf
- chmod 600 "${T}"/mpd.conf
+ 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
+ "${ROOT}"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"
@@ -147,6 +151,7 @@ src_test() {
src_install() {
# No parallel make:
# http://trac.mcs.anl.gov/projects/mpich2/ticket/1095#comment:1
- emake -j1 DESTDIR="${D}" install || die
- rm -f "${D}"/usr/sbin/mpeuninstall || die
+ MAKEOPTS+=" -j1"
+ default
+ rm -f "${ED}"/usr/sbin/mpeuninstall || die
}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
@ 2015-12-29 10:02 Justin Lecher
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher @ 2015-12-29 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 187d20bbeaa33efba1696beb2f54f34ce3ba0e4b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 09:47:01 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 10:01:53 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187d20bb
sys-cluster/mpe2: Use einfo for information
Signed-off-by: Justin Lecher <jlec <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 c85516f..8c657851 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -122,9 +122,9 @@ src_test() {
export MPD_CONF_FILE="${T}/mpd.conf"
"${ROOT}"usr/bin/mpd -d --pidfile="${T}"/mpd.pid
elif [[ "${MPE_IMP}" == openmpi* ]] && [ -z "${MPE2_FORCE_OPENMPI_TEST}" ]; then
- elog
- elog "Skipping tests for openmpi"
- elog
+ echo
+ einfo "Skipping tests for openmpi"
+ echo
return 0
fi
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/
@ 2015-10-19 6:56 Patrice Clement
0 siblings, 0 replies; 8+ messages in thread
From: Patrice Clement @ 2015-10-19 6:56 UTC (permalink / raw
To: gentoo-commits
commit: ed9d02ac4c59587768e07197a9b28e84bd5c907d
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 06:51:57 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 06:55:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9d02ac
sys-cluster/mpe2: Add missing use keyword.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 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 6cda3da..c85516f 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -65,7 +65,7 @@ pkg_setup() {
einfo "Building with support for: sys-cluster/${MPE_IMP}"
- if ! minimal; then
+ if ! use minimal; then
java-pkg-opt-2_pkg_setup
fi
}
@@ -76,7 +76,7 @@ src_prepare() {
epatch "${FILESDIR}"/slog2sdk-trace_rlog-makefile-fixes.patch
epatch "${FILESDIR}"/slog2sdk-trace_sample-makefile-fixes.patch
- if ! minimal; then
+ if ! use minimal; then
java-pkg-opt-2_src_prepare
fi
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-06-11 0:29 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-11 0:29 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/mpe2/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2016-06-01 23:06 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox