public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2012-01-14  5:30 Sebastien Fabbro
  0 siblings, 0 replies; 19+ messages in thread
From: Sebastien Fabbro @ 2012-01-14  5:30 UTC (permalink / raw
  To: gentoo-commits

commit:     c472f894b408e85a7ef1d7bd5d5719ed63f0ffc9
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Wed Jan 11 22:41:59 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 22:41:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c472f894

tweaks to mpich2

---
 sys-cluster/mpich2/ChangeLog              |    3 ++
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |   45 +++++++++++++---------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index c117ec7..ec79f7e 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> mpich2-1.4.1_p1.ebuild:
+  Switch to EAPI4. Fixed license. Prefix love.
+
   10 Jan 2012; Justin Bronder <jsbronder@gentoo.org>
   +files/mpich2-hvector.patch, mpich2-1.4.1_p1.ebuild:
   Drop failing tests for now, fix #393361

diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index ab5e26a..6853722 100644
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -2,21 +2,21 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
-inherit autotools eutils fortran-2 mpi toolchain-funcs
+EAPI=4
+inherit autotools eutils fortran-2 mpi toolchain-funcs versionator
 
 MY_PV=${PV/_/}
-DESCRIPTION="MPICH2 - A portable MPI implementation"
+DESCRIPTION="A high performance and portable MPI implementation"
 HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
 SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug doc fortran mpi-threads romio threads"
+IUSE="+cxx debug doc fortran fortran90 mpi-threads romio threads"
 
 COMMON_DEPEND="dev-libs/libaio
-	>=sys-apps/hwloc-1.1.1
+	sys-apps/hwloc
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
 
@@ -24,12 +24,16 @@ DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	sys-devel/libtool"
 
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	fortran? ( virtual/fortran )"
 
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
-	fortran-2_pkg_setup
+	if use fortran; then
+		use fortran90 && FORTRAN_STANDARD="77 90"
+		fortran-2_pkg_setup
+	fi
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
 
 	if use mpi-threads && ! use threads; then
@@ -72,7 +76,7 @@ src_prepare() {
 		-e "s|dir='\${DESTDIR}|dir='|" \
 		src/env/Makefile.in || die
 
-	# 369263 and 1500 upstream. 	
+	# 369263 and 1500 upstream.
 	epatch "${FILESDIR}"/fix-pkg-config-files.patch
 
 	# 393361, backport of r8809 upstream.
@@ -82,7 +86,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local c="--enable-shared"
+	local c="--enable-shared --disable-rpath"
 	local romio_conf
 
 	# The configure statements can be somewhat confusing, as they
@@ -104,32 +108,25 @@ src_configure() {
 		c="${c} --enable-threads=single"
 	fi
 
-	# enable f90 support for appropriate compilers
-	case "$(tc-getFC)" in
-	    gfortran|if*)
-			c="${c} --enable-f77 --enable-fc";;
-	    g77)
-			c="${c} --enable-f77 --disable-fc";;
-	esac
-
-	! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
+	! mpi_classed && c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
 	econf $(mpi_econf_args) ${c} ${romio_conf} \
 		--docdir=$(mpi_root)/usr/share/doc/${PF} \
 		--with-pm=hydra \
 		--disable-mpe \
-		--with-hwloc-prefix=/usr \
+		--with-hwloc-prefix="${EPREFIX}/usr" \
 		--disable-fast \
 		--enable-smpcoll \
 		$(use_enable romio) \
 		$(use_enable cxx) \
-		|| die
+		$(use_enable fortran f77) \
+		$(use_enable fortran90 fc)
 }
 
 src_compile() {
 	# Oh, the irony.
 	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
 	# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
-	emake -j1 || die
+	emake -j1
 }
 
 src_test() {
@@ -158,9 +155,9 @@ src_test() {
 }
 
 src_install() {
-	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
+	local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
 
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 
 	mpi_dodir /usr/share/doc/${PF}
 	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2015-02-21  2:46 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2015-02-21  2:46 UTC (permalink / raw
  To: gentoo-commits

commit:     9ff4ace7a36ae1aaf8ffaff3bc1d0816c0c436fe
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 02:00:56 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Feb 21 02:46:36 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9ff4ace7

mpich2 will not be ported to multilib

Package-Manager: portage-2.2.14

---
 sys-cluster/mpich2/ChangeLog            |   3 +
 sys-cluster/mpich2/mpich2-1.5-r1.ebuild | 125 --------------------------------
 2 files changed, 3 insertions(+), 125 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 6bb49be..d25dbb0 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Feb 2015; Christoph Junghans <ottxor@gentoo.org> -mpich2-1.5-r1.ebuild:
+  mpich2 will not be ported to multilib
+
   20 Feb 2015; Christoph Junghans <ottxor@gentoo.org> mpich2-1.5-r1.ebuild:
   disable natvie fortran
 

diff --git a/sys-cluster/mpich2/mpich2-1.5-r1.ebuild b/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
deleted file mode 100644
index 8d04b64..0000000
--- a/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.5.ebuild,v 1.9 2013/07/09 22:26:38 jsbronder Exp $
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 multilib-minimal
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+cxx doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
-	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
-	>=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP}]
-	romio? ( net-fs/nfs-utils )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/mpich
-	!sys-cluster/openmpi"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpicxx.h
-	/usr/include/mpi.h
-	/usr/include/mpif.h
-	/usr/include/opa_config.h
-)
-
-pkg_setup() {
-	FORTRAN_STANDARD="77 90"
-	fortran-2_pkg_setup
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-}
-
-src_prepare() {
-	# Using MPICH2LIB_LDFLAGS doesn't seem to full work.
-	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
-		src/packaging/pkgconfig/mpich2.pc.in \
-		src/env/*.in \
-		|| die
-}
-
-multilib_src_configure() {
-	local c="--enable-shared"
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=runtime"
-	else
-		if use threads ; then
-			c="${c} --with-thread-package=pthreads"
-		else
-			c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
-	fi
-
-	export MPICH2LIB_CFLAGS=${CFLAGS}
-	export MPICH2LIB_CPPFLAGS=${CPPFLAGS}
-	export MPICH2LIB_CXXFLAGS=${CXXFLAGS}
-	export MPICH2LIB_FFLAGS=${FFLAGS}
-	export MPICH2LIB_FCFLAGS=${FCFLAGS}
-	export MPICH2LIB_LDFLAGS=${LDFLAGS}
-	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
-	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
-	ECONF_SOURCE=${S} econf ${c} \
-		--with-pm=hydra \
-		--disable-mpe \
-		--disable-fast \
-		--enable-smpcoll \
-		--enable-versioning \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(multilib_native_use_enable fortran fortran all)
-}
-
-multilib_src_test() {
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	#fortran modules are arch-specific, follow OpenMPI and put them in lib
-	if multilib_is_native_abi && use fortran; then
-		mv "${ED}"/usr/include/*.mod "${ED}"/usr/$(get_libdir) || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodir /usr/share/doc/${PF}
-	dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
-	newdoc src/pm/hydra/README README.hydra
-	if use romio; then
-		newdoc src/mpi/romio/README README.romio
-	fi
-
-	if ! use doc; then
-		rm -rf "${D}"usr/share/doc/${PF}/www*
-	fi
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2015-02-20  2:01 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2015-02-20  2:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c4ec00e5eedd5a123c8e309d1aa60a08495fffcc
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 02:00:21 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 02:00:21 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c4ec00e5

disable natvie fortran

Package-Manager: portage-2.2.14

---
 sys-cluster/mpich2/ChangeLog            | 3 +++
 sys-cluster/mpich2/mpich2-1.5-r1.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 0d8cea5..6bb49be 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Feb 2015; Christoph Junghans <ottxor@gentoo.org> mpich2-1.5-r1.ebuild:
+  disable natvie fortran
+
 *mpich2-1.5-r1 (17 Feb 2015)
 
   17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +mpich2-1.5-r1.ebuild:

diff --git a/sys-cluster/mpich2/mpich2-1.5-r1.ebuild b/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
index a1ae784..8d04b64 100644
--- a/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
@@ -95,7 +95,7 @@ multilib_src_configure() {
 		--enable-versioning \
 		$(use_enable romio) \
 		$(use_enable cxx) \
-		$(use_enable fortran fortran all)
+		$(multilib_native_use_enable fortran fortran all)
 }
 
 multilib_src_test() {
@@ -106,7 +106,7 @@ multilib_src_install() {
 	default
 
 	#fortran modules are arch-specific, follow OpenMPI and put them in lib
-	if use fortran; then
+	if multilib_is_native_abi && use fortran; then
 		mv "${ED}"/usr/include/*.mod "${ED}"/usr/$(get_libdir) || die
 	fi
 }


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2015-02-17  0:13 Christoph Junghans
  0 siblings, 0 replies; 19+ messages in thread
From: Christoph Junghans @ 2015-02-17  0:13 UTC (permalink / raw
  To: gentoo-commits

commit:     e2549a4ec7ad969184eae1a491e451868c4b32c2
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 00:07:35 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 00:07:35 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e2549a4e

added multilib mpi for testing

Package-Manager: portage-2.2.14

---
 sys-cluster/mpich2/ChangeLog            |   8 +-
 sys-cluster/mpich2/mpich2-1.5-r1.ebuild | 125 ++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 62400dc..0d8cea5 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich2-1.5-r1 (17 Feb 2015)
+
+  17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +mpich2-1.5-r1.ebuild:
+  added multilib mpi for testing
+
   04 Dec 2013; Justin Lecher <jlec@gentoo.org> -mpich2-1.2.1_p1-r2.ebuild,
   -mpich2-1.4.1_p1.ebuild, metadata.xml:
   Drop old
@@ -176,4 +181,3 @@
   sys-cluster/mpich2/mpich2-1.0.8.ebuild:
   sys-cluster/mpich-1.0.8 bugfixes, no revbump. Fix some doc file locations
   (#255748). Fix sandbox errors (254167).
-

diff --git a/sys-cluster/mpich2/mpich2-1.5-r1.ebuild b/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
new file mode 100644
index 0000000..a1ae784
--- /dev/null
+++ b/sys-cluster/mpich2/mpich2-1.5-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.5.ebuild,v 1.9 2013/07/09 22:26:38 jsbronder Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 multilib-minimal
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
+SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
+	>=sys-apps/hwloc-1.10.0-r2[${MULTILIB_USEDEP}]
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/mpich
+	!sys-cluster/openmpi"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpicxx.h
+	/usr/include/mpi.h
+	/usr/include/mpif.h
+	/usr/include/opa_config.h
+)
+
+pkg_setup() {
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Using MPICH2LIB_LDFLAGS doesn't seem to full work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich2.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+multilib_src_configure() {
+	local c="--enable-shared"
+
+	# The configure statements can be somewhat confusing, as they
+	# don't all show up in the top level configure, however, they
+	# are picked up in the children directories.
+
+	if use mpi-threads; then
+		# MPI-THREAD requries threading.
+		c="${c} --with-thread-package=pthreads"
+		c="${c} --enable-threads=runtime"
+	else
+		if use threads ; then
+			c="${c} --with-thread-package=pthreads"
+		else
+			c="${c} --with-thread-package=none"
+		fi
+		c="${c} --enable-threads=single"
+	fi
+
+	export MPICH2LIB_CFLAGS=${CFLAGS}
+	export MPICH2LIB_CPPFLAGS=${CPPFLAGS}
+	export MPICH2LIB_CXXFLAGS=${CXXFLAGS}
+	export MPICH2LIB_FFLAGS=${FFLAGS}
+	export MPICH2LIB_FCFLAGS=${FCFLAGS}
+	export MPICH2LIB_LDFLAGS=${LDFLAGS}
+	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+	ECONF_SOURCE=${S} econf ${c} \
+		--with-pm=hydra \
+		--disable-mpe \
+		--disable-fast \
+		--enable-smpcoll \
+		--enable-versioning \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran fortran all)
+}
+
+multilib_src_test() {
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	#fortran modules are arch-specific, follow OpenMPI and put them in lib
+	if use fortran; then
+		mv "${ED}"/usr/include/*.mod "${ED}"/usr/$(get_libdir) || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodir /usr/share/doc/${PF}
+	dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
+	newdoc src/pm/hydra/README README.hydra
+	if use romio; then
+		newdoc src/mpi/romio/README README.romio
+	fi
+
+	if ! use doc; then
+		rm -rf "${D}"usr/share/doc/${PF}/www*
+	fi
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2014-09-06 19:46 Jauhien Piatlicki
  0 siblings, 0 replies; 19+ messages in thread
From: Jauhien Piatlicki @ 2014-09-06 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     43665d98b5009f41c973ed16d9ed704028c20a76
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  6 19:44:27 2014 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sat Sep  6 19:44:27 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=43665d98

sys-cluster/mpich2: fix license

---
 sys-cluster/mpich2/mpich2-1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild b/sys-cluster/mpich2/mpich2-1.5.ebuild
index 7622c44..5391972 100644
--- a/sys-cluster/mpich2/mpich2-1.5.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
 SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 
 SLOT="0"
-LICENSE="as-is"
+LICENSE="mpich2"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+cxx doc fortran mpi-threads romio threads"
 


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2013-12-04 16:22 Justin Lecher
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2013-12-04 16:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1ad0d056f30896b39db85b87000e4a399e925a32
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 16:22:42 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Wed Dec  4 16:22:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1ad0d056

sys-cluster/mpich2: Drop old

Package-Manager: portage-2.2.7

---
 sys-cluster/mpich2/ChangeLog                 |   6 +-
 sys-cluster/mpich2/metadata.xml              |  28 ++--
 sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild | 202 ---------------------------
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild    | 179 ------------------------
 4 files changed, 19 insertions(+), 396 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 6c93d92..62400dc 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Dec 2013; Justin Lecher <jlec@gentoo.org> -mpich2-1.2.1_p1-r2.ebuild,
+  -mpich2-1.4.1_p1.ebuild, metadata.xml:
+  Drop old
+
 *mpich2-1.5 (30 Oct 2012)
 
   30 Oct 2012; Justin Bronder <jsbronder@gentoo.org> +mpich2-1.5.ebuild:

diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index 1738cc6..cd2dfc5 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
-	<maintainer>
-		<email>jsbronder@gentoo.org</email>
-		<name>Justin Bronder</name>
-	</maintainer>
-	<maintainer>
-		<email>balaji@mcs.anl.gov</email>
-		<name>Pavan Balaji</name>
-		<description>Upstream Contact</description>
-	</maintainer>
-	<use>
-		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
-		<flag name="romio">Build the ROMIO MPI-IO component</flag>
-	</use>
+  <herd>cluster</herd>
+  <maintainer>
+    <email>jsbronder@gentoo.org</email>
+    <name>Justin Bronder</name>
+  </maintainer>
+  <maintainer>
+    <email>balaji@mcs.anl.gov</email>
+    <name>Pavan Balaji</name>
+    <description>Upstream Contact</description>
+  </maintainer>
+  <use>
+    <flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
+    <flag name="romio">Build the ROMIO MPI-IO component</flag>
+  </use>
 </pkgmetadata>

diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
deleted file mode 100644
index 5b2ddd0..0000000
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_DEPEND="2"
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 mpi python toolchain-funcs
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug doc fortran mpi-threads romio threads"
-
-MPI_UNCLASSED_DEP_STR="!media-sound/mpd"
-
-COMMON_DEPEND="
-	dev-libs/libaio
-	romio? ( net-fs/nfs-utils )
-	$(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-
-	MPI_ESELECT_FILE="eselect.mpi.mpich2"
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-
-	if mpi_classed; then
-		MPD_CONF_FILE_DIR=/etc/$(mpi_class)
-	else
-		MPD_CONF_FILE_DIR=/etc/${PN}
-	fi
-
-}
-
-src_prepare() {
-	# Upstream trunk, r5843
-	epatch "${FILESDIR}"/0001-MPD_CONF_FILE-should-be-readable.patch
-	# Upstream trunk, r5844
-	epatch "${FILESDIR}"/0002-mpd_conf_file-search-order.patch
-	# Upstream trunk, r5845
-	epatch "${FILESDIR}"/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch
-	# Upstream trunk, r6848
-	epatch "${FILESDIR}"/mpich2-1.2.1-fix-missing-libs.patch
-
-	# We need f90 to include the directory with mods, and to
-	# fix hardcoded paths for src_test()
-	# Submitted upstream.
-	sed -i \
-		-e "s,F90FLAGS\( *\)=,F90FLAGS\1?=," \
-		-e "s,\$(bindir)/,${S}/bin/,g" \
-		-e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \
-		$(find ./test/ -name 'Makefile.in') || die
-
-	if ! use romio; then
-		# These tests in errhan/ rely on MPI::File ...which is in romio
-		echo "" > test/mpi/errors/cxx/errhan/testlist
-	fi
-
-	# 293665:  Should check in on MPICH2_MPIX_FLAGS in later releases
-	# (>1.3) as this is seeing some development in trunk as of r6350.
-	sed -i \
-		-e 's|\(WRAPPER_[A-Z90]*FLAGS\)="@.*@"|\1=""|' \
-		src/env/mpi*.in || die
-}
-
-src_configure() {
-	local c="--enable-sharedlibs=gcc"
-	local romio_conf
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.
-
-	use debug && c="${c} --enable-g=all --enable-debuginfo"
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=default"
-	else
-		if use threads ; then
-			c="${c} --with-thread-package=pthreads"
-		else
-			c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
-	fi
-
-	# enable f90 support for appropriate compilers
-	case "$(tc-getFC)" in
-	    gfortran|if*)
-			c="${c} --enable-f77 --enable-f90";;
-	    g77)
-			c="${c} --enable-f77 --disable-f90";;
-	esac
-
-	! mpi_classed && c="${c} --sysconfdir=/etc/${PN}"
-	econf $(mpi_econf_args) ${c} ${romio_conf} \
-		--docdir=$(mpi_root)/usr/share/doc/${PF} \
-		--with-pm=mpd:hydra \
-		--disable-mpe \
-		$(use_enable romio) \
-		$(use_enable cxx)
-}
-
-# Oh, the irony.
-# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
-MAKEOPTS+=" -j1"
-
-src_test() {
-	local rc
-
-	cp "${FILESDIR}"/mpd.conf "${T}"/mpd.conf || die
-	chmod 600 "${T}"/mpd.conf
-	export MPD_CONF_FILE="${T}/mpd.conf"
-	"${S}"/bin/mpd --daemon --pid="${T}"/mpd.pid
-
-	make \
-		CC="${S}"/bin/mpicc \
-		CXX="${S}"/bin/mpicxx \
-		FC="${S}"/bin/mpif77 \
-		F90="${S}"/bin/mpif90 \
-		F90FLAGS="${F90FLAGS} -I${S}/src/binding/f90/" \
-		testing
-	rc=$?
-
-	"${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
-	return ${rc}
-}
-
-src_install() {
-	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
-	local f
-
-	default
-
-	dodir ${MPD_CONF_FILE_DIR}
-	insinto ${MPD_CONF_FILE_DIR}
-	doins "${FILESDIR}"/mpd.conf
-
-	mpi_dodir /usr/share/doc/${PF}
-	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES
-	mpi_newdoc src/pm/mpd/README README.mpd
-	if use romio; then
-		mpi_newdoc src/mpi/romio/README README.romio
-	fi
-
-	if ! use doc; then
-		rm -rf "${d}"usr/share/doc/www*
-	else
-		mpi_dodir /usr/share/doc/${PF}/www
-		mv "${d}"usr/share/doc/www*/* "${d}"usr/share/doc/${PF}/www/
-	fi
-
-	mpi_imp_add_eselect
-
-	# See #316937
-	MPD_PYTHON_MODULES=""
-	for f in "${d}"usr/bin/*.py; do
-		MPD_PYTHON_MODULES="${MPD_PYTHON_MODULES} ${f##${d}}"
-	done
-}
-
-pkg_postinst() {
-	# Here so we can play with ebuild commands as a normal user
-	chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
-	chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
-
-	echo ""
-	elog "MPE2 has been removed from this ebuild and now stands alone"
-	elog "as sys-cluster/mpe2."
-	echo ""
-
-	python_mod_optimize ${MPD_PYTHON_MODULES}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MPD_PYTHON_MODULES}
-}

diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
deleted file mode 100644
index b9f91dd..0000000
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools eutils fortran-2 mpi toolchain-funcs versionator
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="
-	dev-libs/libaio
-	sys-apps/hwloc
-	romio? ( net-fs/nfs-utils )
-	$(mpi_imp_deplist)"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
-	FORTRAN_STANDARD="77 90"
-	fortran-2_pkg_setup
-	MPI_ESELECT_FILE="eselect.mpi.mpich2"
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-
-	if mpi_classed; then
-		MPD_CONF_FILE_DIR=/etc/$(mpi_class)
-	else
-		MPD_CONF_FILE_DIR=/etc/${PN}
-	fi
-
-}
-
-src_prepare() {
-	# Cannot use bin/mpiexec as hydra is built by autotools and is
-	# a shell wrapped executable.
-	sed -i \
-		-e "s,@MPIEXEC@,${S}/src/pm/hydra/mpiexec.hydra,g" \
-		$(find ./test/ -name 'Makefile.in') || die
-
-	# #293665
-	# We could use MPICH2LIB_XFLAGS here and unset the cooresponding ones
-	# in the environment, however that's messy and doesn't for for LDFLAGS.
-	sed -i \
-		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
-		src/env/*.in || die
-
-	# See
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010680.html
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010678.html
-	# and countless other sources pointing out the insanity.
-	sed -i \
-		-e 's|prefix=${DESTDIR}|prefix=|g' \
-		-e 's|dir=${DESTDIR}|dir=|g' \
-		Makefile.in || die
-
-	sed -i \
-		-e "s|prefix='\${DESTDIR}|prefix='|" \
-		-e "s|dir='\${DESTDIR}|dir='|" \
-		src/env/Makefile.in || die
-
-	# 369263 and 1500 upstream.
-	epatch "${FILESDIR}"/fix-pkg-config-files.patch
-
-	# 393361, backport of r8809 upstream.
-	epatch "${FILESDIR}"/mpich2-hvector.patch
-
-	AT_M4DIR="${S}"/confdb eautoreconf
-}
-
-src_configure() {
-	local c="--enable-shared --disable-rpath"
-	local romio_conf
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.
-
-	use debug && c="${c} --enable-g=dbg --enable-debuginfo"
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=runtime"
-	else
-		if use threads ; then
-			c="${c} --with-thread-package=pthreads"
-		else
-			c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
-	fi
-
-	if ! mpi_classed; then
-		c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-		c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
-	else
-		c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
-	fi
-
-	econf $(mpi_econf_args) ${c} ${romio_conf} \
-		--with-pm=hydra \
-		--disable-mpe \
-		--with-hwloc-prefix="${EPREFIX}/usr" \
-		--disable-fast \
-		--enable-smpcoll \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(use_enable fortran f77) \
-		$(use_enable fortran fc)
-}
-
-# Oh, the irony.
-# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
-MAKEOPTS+=" -j1"
-
-src_test() {
-	# See #362655 and comments in the testlist files.
-	# large_message:  only on machines with > 8gb of ram
-	# bcastlength:  This is an extension to MPI that's not necessary
-	# non_zero_root: performance test
-	# Also note that I/O tests may fail on non-local filesystems.
-	sed -i '/^[# ]*large_message/d' test/mpi/pt2pt/testlist || die
-	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
-	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
-
-	# Failing tests based on requiring MPI_THREAD_MULTIPLE.
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2012-January/011618.html
-	sed -i \
-		-e '/^[# ]*pt2pt/d' \
-		-e '/^[# ]*comm/d' \
-		-e '/^[# ]*spawn/d' \
-		test/mpi/threads/testlist || die
-
-	emake \
-		CC="${S}"/bin/mpicc \
-		CXX="${S}"/bin/mpicxx \
-		F77="${S}"/bin/mpif77 \
-		FC="${S}"/bin/mpif90 \
-		testing
-}
-
-src_install() {
-	local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
-
-	default
-
-	mpi_dodir /usr/share/doc/${PF}
-	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES
-	mpi_newdoc src/pm/hydra/README README.hydra
-	if use romio; then
-		mpi_newdoc src/mpi/romio/README README.romio
-	fi
-
-	if ! use doc; then
-		rm -rf "${d}"usr/share/doc/${PF}/www*
-	fi
-
-	mpi_imp_add_eselect
-}


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2012-11-01 20:10 Kacper Kowalik
  0 siblings, 0 replies; 19+ messages in thread
From: Kacper Kowalik @ 2012-11-01 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     b10c1dbf92324e438e8967e237701aa14fd983ab
Author:     Justin Bronder <jbronder <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 16:55:19 2012 +0000
Commit:     Kacper Kowalik <xarthisius <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 16:55:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b10c1dbf

bump

Package-Manager: portage-2.1.11.30

---
 sys-cluster/mpich2/ChangeLog         |    5 ++
 sys-cluster/mpich2/mpich2-1.5.ebuild |  128 ++++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 6f093d8..6c93d92 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich2-1.5 (30 Oct 2012)
+
+  30 Oct 2012; Justin Bronder <jsbronder@gentoo.org> +mpich2-1.5.ebuild:
+  Bump
+
   26 Oct 2012; Justin Lecher <jlec@gentoo.org> mpich2-1.2.1_p1-r2.ebuild,
   mpich2-1.4.1_p1.ebuild, metadata.xml:
   Move to EAPI=5, use fortran-2.eclass correctly

diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild b/sys-cluster/mpich2/mpich2-1.5.ebuild
new file mode 100644
index 0000000..d1ce401
--- /dev/null
+++ b/sys-cluster/mpich2/mpich2-1.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 mpi
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
+SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	sys-apps/hwloc
+	romio? ( net-fs/nfs-utils )
+	$(mpi_imp_deplist)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+pkg_setup() {
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
+	MPI_ESELECT_FILE="eselect.mpi.mpich2"
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+
+	if mpi_classed; then
+		MPD_CONF_FILE_DIR=/etc/$(mpi_class)
+	else
+		MPD_CONF_FILE_DIR=/etc/${PN}
+	fi
+
+}
+
+src_prepare() {
+	# Using MPICH2LIB_LDFLAGS doesn't seem to full work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich2.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+src_configure() {
+	local c="--enable-shared"
+
+	# The configure statements can be somewhat confusing, as they
+	# don't all show up in the top level configure, however, they
+	# are picked up in the children directories.
+
+	if use mpi-threads; then
+		# MPI-THREAD requries threading.
+		c="${c} --with-thread-package=pthreads"
+		c="${c} --enable-threads=runtime"
+	else
+		if use threads ; then
+			c="${c} --with-thread-package=pthreads"
+		else
+			c="${c} --with-thread-package=none"
+		fi
+		c="${c} --enable-threads=single"
+	fi
+
+	if ! mpi_classed; then
+		c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+		c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+	else
+		c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
+	fi
+
+	export MPICH2LIB_CFLAGS=${CFLAGS}
+	export MPICH2LIB_CPPFLAGS=${CPPFLAGS}
+	export MPICH2LIB_CXXFLAGS=${CXXFLAGS}
+	export MPICH2LIB_FFLAGS=${FFLAGS}
+	export MPICH2LIB_FCFLAGS=${FCFLAGS}
+	export MPICH2LIB_LDFLAGS=${LDFLAGS}
+	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	econf $(mpi_econf_args) ${c} \
+		--with-pm=hydra \
+		--disable-mpe \
+		--disable-fast \
+		--enable-smpcoll \
+		--enable-versioning \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran f77) \
+		$(use_enable fortran fc)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
+
+	default
+
+	mpi_dodir /usr/share/doc/${PF}
+	mpi_dodoc COPYRIGHT README{,.envvar} CHANGES RELEASE_NOTES
+	mpi_newdoc src/pm/hydra/README README.hydra
+	if use romio; then
+		mpi_newdoc src/mpi/romio/README README.romio
+	fi
+
+	if ! use doc; then
+		rm -rf "${d}"usr/share/doc/${PF}/www*
+	fi
+
+	mpi_imp_add_eselect
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2012-10-29 11:00 Justin Lecher
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2012-10-29 11:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ea31a80dd59c6c2717dd6babbae015139ab6291a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 26 10:45:44 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 26 10:45:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ea31a80d

sys-cluster/mpich2: Move to EAPI=5, use fortran-2.eclass correctly

Package-Manager: portage-2.2.0_alpha141

---
 sys-cluster/mpich2/ChangeLog                 |    4 ++
 sys-cluster/mpich2/metadata.xml              |    4 +-
 sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild |   41 +++++++++++++------------
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild    |   41 ++++++++++++-------------
 4 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 39cb67f..6f093d8 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Oct 2012; Justin Lecher <jlec@gentoo.org> mpich2-1.2.1_p1-r2.ebuild,
+  mpich2-1.4.1_p1.ebuild, metadata.xml:
+  Move to EAPI=5, use fortran-2.eclass correctly
+
   20 Apr 2012; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4.1_p1.ebuild:
   Fix docdir for prefix. Thanks to Robert McGehee for reporting.
 

diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index 27045b0..1738cc6 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/metadata.xml
@@ -12,7 +12,7 @@
 		<description>Upstream Contact</description>
 	</maintainer>
 	<use>
-		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
-		<flag name='romio'>Build the ROMIO MPI-IO component</flag>
+		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
+		<flag name="romio">Build the ROMIO MPI-IO component</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
index eca3941..5b2ddd0 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
+
 PYTHON_DEPEND="2"
 
+FORTRAN_NEEDED=fortran
+
 inherit eutils fortran-2 mpi python toolchain-funcs
 
 MY_PV=${PV/_/}
-DESCRIPTION="MPICH2 - A portable MPI implementation"
+DESCRIPTION="A high performance and portable MPI implementation"
 HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
 SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 
-LICENSE="as-is"
 SLOT="0"
+LICENSE="as-is"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran mpi-threads romio threads"
 
 MPI_UNCLASSED_DEP_STR="!media-sound/mpd"
 
-COMMON_DEPEND="dev-libs/libaio
+COMMON_DEPEND="
+	dev-libs/libaio
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
 
@@ -118,16 +122,13 @@ src_configure() {
 		--with-pm=mpd:hydra \
 		--disable-mpe \
 		$(use_enable romio) \
-		$(use_enable cxx) \
-		|| die
+		$(use_enable cxx)
 }
 
-src_compile() {
-	# Oh, the irony.
-	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
-	emake -j1 || die
-}
+# Oh, the irony.
+# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
+# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
+MAKEOPTS+=" -j1"
 
 src_test() {
 	local rc
@@ -154,17 +155,17 @@ src_install() {
 	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
 	local f
 
-	emake DESTDIR="${D}" install || die
+	default
 
 	dodir ${MPD_CONF_FILE_DIR}
 	insinto ${MPD_CONF_FILE_DIR}
-	doins "${FILESDIR}"/mpd.conf || die
+	doins "${FILESDIR}"/mpd.conf
 
 	mpi_dodir /usr/share/doc/${PF}
-	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die
-	mpi_newdoc src/pm/mpd/README README.mpd || die
+	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES
+	mpi_newdoc src/pm/mpd/README README.mpd
 	if use romio; then
-		mpi_newdoc src/mpi/romio/README README.romio || die
+		mpi_newdoc src/mpi/romio/README README.romio
 	fi
 
 	if ! use doc; then
@@ -188,10 +189,10 @@ pkg_postinst() {
 	chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 	chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 
-	elog ""
+	echo ""
 	elog "MPE2 has been removed from this ebuild and now stands alone"
 	elog "as sys-cluster/mpe2."
-	elog ""
+	echo ""
 
 	python_mod_optimize ${MPD_PYTHON_MODULES}
 }

diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index 0a3903e..b9f91dd 100644
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
 inherit autotools eutils fortran-2 mpi toolchain-funcs versionator
 
 MY_PV=${PV/_/}
@@ -10,12 +13,13 @@ DESCRIPTION="A high performance and portable MPI implementation"
 HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
 SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 
-LICENSE="as-is"
 SLOT="0"
+LICENSE="as-is"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran mpi-threads romio threads"
 
-COMMON_DEPEND="dev-libs/libaio
+COMMON_DEPEND="
+	dev-libs/libaio
 	sys-apps/hwloc
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
@@ -24,16 +28,13 @@ DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	sys-devel/libtool"
 
-RDEPEND="${COMMON_DEPEND}
-	fortran? ( virtual/fortran )"
+RDEPEND="${COMMON_DEPEND}"
 
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
-	if use fortran; then
-		FORTRAN_STANDARD="77 90"
-		fortran-2_pkg_setup
-	fi
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
 
 	if use mpi-threads && ! use threads; then
@@ -82,7 +83,7 @@ src_prepare() {
 	# 393361, backport of r8809 upstream.
 	epatch "${FILESDIR}"/mpich2-hvector.patch
 
-	AT_M4DIR="${S}"/confdb eautoreconf || die
+	AT_M4DIR="${S}"/confdb eautoreconf
 }
 
 src_configure() {
@@ -127,12 +128,10 @@ src_configure() {
 		$(use_enable fortran fc)
 }
 
-src_compile() {
-	# Oh, the irony.
-	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
-	emake -j1
-}
+# Oh, the irony.
+# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
+# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
+MAKEOPTS+=" -j1"
 
 src_test() {
 	# See #362655 and comments in the testlist files.
@@ -152,7 +151,7 @@ src_test() {
 		-e '/^[# ]*spawn/d' \
 		test/mpi/threads/testlist || die
 
-	emake -j1 \
+	emake \
 		CC="${S}"/bin/mpicc \
 		CXX="${S}"/bin/mpicxx \
 		F77="${S}"/bin/mpif77 \
@@ -163,13 +162,13 @@ src_test() {
 src_install() {
 	local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
 
-	emake -j1 DESTDIR="${D}" install
+	default
 
 	mpi_dodir /usr/share/doc/${PF}
-	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die
-	mpi_newdoc src/pm/hydra/README README.hydra || die
+	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES
+	mpi_newdoc src/pm/hydra/README README.hydra
 	if use romio; then
-		mpi_newdoc src/mpi/romio/README README.romio || die
+		mpi_newdoc src/mpi/romio/README README.romio
 	fi
 
 	if ! use doc; then


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2012-04-21  0:43 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2012-04-21  0:43 UTC (permalink / raw
  To: gentoo-commits

commit:     9a1ce8ac96b6f889a1da7c5bcc610e2e8355b4c9
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 22:41:29 2012 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 22:41:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9a1ce8ac

Fix docdir for prefix.  Thanks to Robert McGehee for reporting.

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/ChangeLog              |    3 +++
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |    9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index a56b0e4..39cb67f 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Apr 2012; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4.1_p1.ebuild:
+  Fix docdir for prefix. Thanks to Robert McGehee for reporting.
+
   07 Mar 2012; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4.1_p1.ebuild,
   metadata.xml:
   Enable all fortran with single USE flag, fix license.

diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index 95c85ed..0a3903e 100644
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -108,9 +108,14 @@ src_configure() {
 		c="${c} --enable-threads=single"
 	fi
 
-	! mpi_classed && c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+	if ! mpi_classed; then
+		c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+		c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+	else
+		c="${c} --docdir=$(mpi_root)/usr/share/doc/${PF}"
+	fi
+
 	econf $(mpi_econf_args) ${c} ${romio_conf} \
-		--docdir=$(mpi_root)/usr/share/doc/${PF} \
 		--with-pm=hydra \
 		--disable-mpe \
 		--with-hwloc-prefix="${EPREFIX}/usr" \



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2012-03-07  1:27 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2012-03-07  1:27 UTC (permalink / raw
  To: gentoo-commits

commit:     27d8cabe937814629758369fe9921028f9a9309c
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  7 01:26:56 2012 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed Mar  7 01:26:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=27d8cabe

Enable all fortran with single USE flag, fix license.

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/ChangeLog              |    4 ++++
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |    8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index ec79f7e..a56b0e4 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Mar 2012; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4.1_p1.ebuild,
+  metadata.xml:
+  Enable all fortran with single USE flag, fix license.
+
   11 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> mpich2-1.4.1_p1.ebuild:
   Switch to EAPI4. Fixed license. Prefix love.
 

diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index 663d685..95c85ed 100644
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -10,10 +10,10 @@ DESCRIPTION="A high performance and portable MPI implementation"
 HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
 SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
 
-LICENSE="MIT"
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug doc fortran fortran90 mpi-threads romio threads"
+IUSE="+cxx debug doc fortran mpi-threads romio threads"
 
 COMMON_DEPEND="dev-libs/libaio
 	sys-apps/hwloc
@@ -31,7 +31,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
 	if use fortran; then
-		use fortran90 && FORTRAN_STANDARD="77 90"
+		FORTRAN_STANDARD="77 90"
 		fortran-2_pkg_setup
 	fi
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
@@ -119,7 +119,7 @@ src_configure() {
 		$(use_enable romio) \
 		$(use_enable cxx) \
 		$(use_enable fortran f77) \
-		$(use_enable fortran90 fc)
+		$(use_enable fortran fc)
 }
 
 src_compile() {



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2012-01-11 17:39 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2012-01-11 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     a19ee9358dcfb3269bb741cb6e45e533e1ee5d3f
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 17:39:48 2012 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 17:39:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a19ee935

mpich2:  add link to upstream report

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
index ab5e26a..bf09481 100644
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
@@ -143,6 +143,7 @@ src_test() {
 	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
 
 	# Failing tests based on requiring MPI_THREAD_MULTIPLE.
+	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2012-January/011618.html
 	sed -i \
 		-e '/^[# ]*pt2pt/d' \
 		-e '/^[# ]*comm/d' \



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     5a605195a6dc5ae7d34f377020a088d659543260
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 16:20:36 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 16:20:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5a605195

Sort inherit and/or USE

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild |    4 ++--
 sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
index 29a861d..eca3941 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
@@ -5,7 +5,7 @@
 EAPI=2
 PYTHON_DEPEND="2"
 
-inherit eutils fortran-2 python mpi toolchain-funcs
+inherit eutils fortran-2 mpi python toolchain-funcs
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -15,7 +15,7 @@ SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug doc fortran threads romio mpi-threads"
+IUSE="+cxx debug doc fortran mpi-threads romio threads"
 
 MPI_UNCLASSED_DEP_STR="!media-sound/mpd"
 

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
index 5ece5d5..04ef15e 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=2
-inherit eutils fortran-2 mpi toolchain-funcs autotools
+inherit autotools eutils fortran-2 mpi toolchain-funcs
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -13,7 +13,7 @@ SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug doc fortran threads romio mpi-threads"
+IUSE="+cxx debug doc fortran mpi-threads romio threads"
 
 COMMON_DEPEND="dev-libs/libaio
 	>=sys-apps/hwloc-1.1.1



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2011-06-21 11:54 Justin Lecher
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2011-06-21 11:54 UTC (permalink / raw
  To: gentoo-commits

commit:     3234b73658b1bc441f03f63267f1ab82004a7c32
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:18:44 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:18:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3234b736

Added fortran-2.eclass support

(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

---
 sys-cluster/mpich2/ChangeLog                 |    4 ++++
 sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild |    3 ++-
 sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild  |    3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index dd19de2..a50bc00 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> mpich2-1.2.1_p1-r2.ebuild,
+  mpich2-1.4_rc2-r1.ebuild:
+  Added fortran-2.eclass support
+
 *mpich2-1.4_rc2-r1 (12 Jun 2011)
 
   12 Jun 2011; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.4_rc2.ebuild,

diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
index ae50b11..29a861d 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild
@@ -5,7 +5,7 @@
 EAPI=2
 PYTHON_DEPEND="2"
 
-inherit eutils python mpi toolchain-funcs
+inherit eutils fortran-2 python mpi toolchain-funcs
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -32,6 +32,7 @@ RDEPEND="${COMMON_DEPEND}"
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
+	fortran-2_pkg_setup
 	python_set_active_version 2
 	python_pkg_setup
 

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
index ddfe4b5..5ece5d5 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=2
-inherit eutils mpi toolchain-funcs autotools
+inherit eutils fortran-2 mpi toolchain-funcs autotools
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -29,6 +29,7 @@ RDEPEND="${COMMON_DEPEND}"
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_setup() {
+	fortran-2_pkg_setup
 	MPI_ESELECT_FILE="eselect.mpi.mpich2"
 
 	if use mpi-threads && ! use threads; then



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2011-05-10 14:30 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2011-05-10 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     9492556f33193a4813a77c278fe2a7c01580176a
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 14:30:04 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Tue May 10 14:30:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9492556f

Correct fix for #293665

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/ChangeLog             |    3 +++
 sys-cluster/mpich2/mpich2-1.4_rc2.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 7ac9c7b..24b5f57 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 May 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4_rc2.ebuild:
+  Correct fix for #293665
+
   05 May 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4_rc2.ebuild:
   Re-enable some tests
 

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
index b755f07..383e59e 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
@@ -55,7 +55,7 @@ src_prepare() {
 	# in the environment, however that's messy and doesn't for for LDFLAGS.
 	sed -i \
 		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
-		src/env/*.conf.in || die
+		src/env/*.in || die
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2011-05-05 19:03 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2011-05-05 19:03 UTC (permalink / raw
  To: gentoo-commits

commit:     5c5f0614710600579aa3520dd3c402721a3da8bb
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 16:30:17 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Thu May  5 16:30:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5c5f0614

Re-enable some tests

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/ChangeLog             |    3 +++
 sys-cluster/mpich2/mpich2-1.4_rc2.ebuild |   14 +-------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index d177bab..7ac9c7b 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 May 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4_rc2.ebuild:
+  Re-enable some tests
+
   04 May 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4_rc2.ebuild:
   Sync with main tree. Add ~hppa, fix comments, fix #293665 fix.
 

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
index 1c08515..b755f07 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
@@ -59,7 +59,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local c="--enable-shared --enable-sharedlibs=gcc"
+	local c="--enable-shared"
 	local romio_conf
 
 	# The configure statements can be somewhat confusing, as they
@@ -110,11 +110,6 @@ src_compile() {
 }
 
 src_test() {
-	if ! use romio; then
-		# These tests in errhan/ rely on MPI::File ...which is in romio
-		echo "" > test/mpi/errors/cxx/errhan/testlist
-	fi
-
 	# See #362655 and comments in the testlist files.
 	# large_message:  only on machines with > 8gb of ram
 	# bcastlength:  This is an extension to MPI that's not necessary
@@ -124,13 +119,6 @@ src_test() {
 	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
 	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
 
-	if use debug; then
-		# http://bugs.gentoo.org/show_bug.cgi?id=362655#c8
-		sed -i '/^[# ]*scancel/d' test/mpi/pt2pt/testlist || die
-		sed -i '/^[# ]*pscancel/d' test/mpi/pt2pt/testlist || die
-		sed -i '/^[# ]*cancelrecv/d' test/mpi/pt2pt/testlist || die
-	fi
-
 	emake -j1 \
 		CC="${S}"/bin/mpicc \
 		CXX="${S}"/bin/mpicxx \



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2011-05-04  4:09 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2011-05-04  4:09 UTC (permalink / raw
  To: gentoo-commits

commit:     edf300ef54367a600cac07fa97810e01d53f6d8a
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 04:09:24 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed May  4 04:09:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=edf300ef

Enable debugging as recommended by upstream (#362655)

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/mpich2-1.4_rc2.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
index 0be12e8..1c08515 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
@@ -66,7 +66,7 @@ src_configure() {
 	# don't all show up in the top level configure, however, they
 	# are picked up in the children directories.
 
-	use debug && c="${c} --enable-g=all --enable-debuginfo"
+	use debug && c="${c} --enable-g=dbg --enable-debuginfo"
 
 	if use mpi-threads; then
 		# MPI-THREAD requries threading.



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2011-05-04  3:48 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2011-05-04  3:48 UTC (permalink / raw
  To: gentoo-commits

commit:     c74a147d7e440579b0664efa4e0f44666a6988a3
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 03:48:11 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed May  4 03:48:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c74a147d

disable parallel install

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/mpich2-1.4_rc2.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
index 42992d7..0be12e8 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
@@ -142,7 +142,7 @@ src_test() {
 src_install() {
 	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
 
-	emake DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install || die
 
 	mpi_dodir /usr/share/doc/${PF}
 	mpi_dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2011-05-04  2:38 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2011-05-04  2:38 UTC (permalink / raw
  To: gentoo-commits

commit:     aea0714e38ec718bb3be87da1ea988f8c35400ad
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 02:38:12 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Wed May  4 02:38:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=aea0714e

Sync with main tree.   Add ~hppa, fix comments, fix #293665 fix.

---
 sys-cluster/mpich2/ChangeLog             |    3 +++
 sys-cluster/mpich2/mpich2-1.4_rc2.ebuild |   15 ++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index eae2a9b..d177bab 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 May 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4_rc2.ebuild:
+  Sync with main tree. Add ~hppa, fix comments, fix #293665 fix.
+
 *mpich2-1.4_rc2 (02 May 2011)
 
   02 May 2011; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.3.ebuild,

diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
index 859310a..42992d7 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran threads romio mpi-threads"
 
 COMMON_DEPEND="dev-libs/libaio
@@ -44,17 +44,18 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Cannot use bin/mpiexec, as hydra is built by autotools and is
-	# a shell wrapped executabled.
+	# Cannot use bin/mpiexec as hydra is built by autotools and is
+	# a shell wrapped executable.
 	sed -i \
 		-e "s,@MPIEXEC@,${S}/src/pm/hydra/mpiexec.hydra,g" \
 		$(find ./test/ -name 'Makefile.in') || die
 
-	# 293665:  Should check in on MPICH2_MPIX_FLAGS in later releases
-	# (>1.3) as this is seeing some development in trunk as of r6350.
+	# #293665
+	# We could use MPICH2LIB_XFLAGS here and unset the cooresponding ones
+	# in the environment, however that's messy and doesn't for for LDFLAGS.
 	sed -i \
-		-e 's|\(WRAPPER_[A-Z90]*FLAGS\)="@.*@"|\1=""|' \
-		src/env/mpi*.in || die
+		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
+		src/env/*.conf.in || die
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/
@ 2011-05-02  1:23 Justin Bronder
  0 siblings, 0 replies; 19+ messages in thread
From: Justin Bronder @ 2011-05-02  1:23 UTC (permalink / raw
  To: gentoo-commits

commit:     58d41ac415cb352b759ea895d9f041a461f52ffc
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 01:22:40 2011 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon May  2 01:22:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=58d41ac4

Version bump. Use system hwloc. Switch to hydra instead of mpd for pm. Disable more tests as suggested by upstream. #362655.

(Portage version: 2.1.9.46/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

---
 sys-cluster/mpich2/ChangeLog                       |    7 +++
 .../{mpich2-1.3.ebuild => mpich2-1.4_rc2.ebuild}   |   54 +++++++++++--------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 9bbe99a..eae2a9b 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich2-1.4_rc2 (02 May 2011)
+
+  02 May 2011; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.3.ebuild,
+  +mpich2-1.4_rc2.ebuild:
+  Version bump. Use system hwloc. Switch to hydra instead of mpd for
+  pm. Disable more tests as suggested by upstream. #362655.
+
   22 Mar 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.2.1_p1-r2.ebuild:
   Use MPI_UNCLASSED_DEP_STR over MPI_UNCLASSED_BLOCKERS
 

diff --git a/sys-cluster/mpich2/mpich2-1.3.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
similarity index 73%
rename from sys-cluster/mpich2/mpich2-1.3.ebuild
rename to sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
index 591d511..859310a 100644
--- a/sys-cluster/mpich2/mpich2-1.3.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -12,11 +12,11 @@ SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran threads romio mpi-threads"
 
 COMMON_DEPEND="dev-libs/libaio
-	sys-apps/hwloc
+	>=sys-apps/hwloc-1.1.1
 	romio? ( net-fs/nfs-utils )
 	$(mpi_imp_deplist)"
 
@@ -44,20 +44,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# We need f90 to include the directory with mods, and to
-	# fix hardcoded paths for src_test()
-	# Submitted upstream.
+	# Cannot use bin/mpiexec, as hydra is built by autotools and is
+	# a shell wrapped executabled.
 	sed -i \
-		-e "s,FCFLAGS\( *\)=,FCFLAGS\1?=," \
-		-e "s,\$(bindir)/,${S}/bin/,g" \
-		-e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \
+		-e "s,@MPIEXEC@,${S}/src/pm/hydra/mpiexec.hydra,g" \
 		$(find ./test/ -name 'Makefile.in') || die
 
-	if ! use romio; then
-		# These tests in errhan/ rely on MPI::File ...which is in romio
-		echo "" > test/mpi/errors/cxx/errhan/testlist
-	fi
-
 	# 293665:  Should check in on MPICH2_MPIX_FLAGS in later releases
 	# (>1.3) as this is seeing some development in trunk as of r6350.
 	sed -i \
@@ -78,7 +70,7 @@ src_configure() {
 	if use mpi-threads; then
 		# MPI-THREAD requries threading.
 		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=default"
+		c="${c} --enable-threads=runtime"
 	else
 		if use threads ; then
 			c="${c} --with-thread-package=pthreads"
@@ -102,6 +94,8 @@ src_configure() {
 		--with-pm=hydra \
 		--disable-mpe \
 		--with-hwloc-prefix=/usr \
+		--disable-fast \
+		--enable-smpcoll \
 		$(use_enable romio) \
 		$(use_enable cxx) \
 		|| die
@@ -110,28 +104,42 @@ src_configure() {
 src_compile() {
 	# Oh, the irony.
 	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
+	# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
 	emake -j1 || die
 }
 
 src_test() {
-	local rc
+	if ! use romio; then
+		# These tests in errhan/ rely on MPI::File ...which is in romio
+		echo "" > test/mpi/errors/cxx/errhan/testlist
+	fi
 
-	make \
+	# See #362655 and comments in the testlist files.
+	# large_message:  only on machines with > 8gb of ram
+	# bcastlength:  This is an extension to MPI that's not necessary
+	# non_zero_root: performance test
+	# Also note that I/O tests may fail on non-local filesystems.
+	sed -i '/^[# ]*large_message/d' test/mpi/pt2pt/testlist || die
+	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
+	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
+
+	if use debug; then
+		# http://bugs.gentoo.org/show_bug.cgi?id=362655#c8
+		sed -i '/^[# ]*scancel/d' test/mpi/pt2pt/testlist || die
+		sed -i '/^[# ]*pscancel/d' test/mpi/pt2pt/testlist || die
+		sed -i '/^[# ]*cancelrecv/d' test/mpi/pt2pt/testlist || die
+	fi
+
+	emake -j1 \
 		CC="${S}"/bin/mpicc \
 		CXX="${S}"/bin/mpicxx \
 		F77="${S}"/bin/mpif77 \
 		FC="${S}"/bin/mpif90 \
-		FCFLAGS="${FCFLAGS} -I${S}/src/binding/f90/" \
 		testing
-	rc=$?
-
-	return ${rc}
 }
 
 src_install() {
 	local d=$(echo ${D}/$(mpi_root)/ | sed 's,///*,/,g')
-	local f
 
 	emake DESTDIR="${D}" install || die
 



^ permalink raw reply related	[flat|nested] 19+ messages in thread
end of thread, other threads:[~2015-02-21  2:46 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-14  5:30 [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/ Sebastien Fabbro
  -- strict thread matches above, loose matches on Subject: below --
2015-02-21  2:46 Christoph Junghans
2015-02-20  2:01 Christoph Junghans
2015-02-17  0:13 Christoph Junghans
2014-09-06 19:46 Jauhien Piatlicki
2013-12-04 16:22 Justin Lecher
2012-11-01 20:10 Kacper Kowalik
2012-10-29 11:00 Justin Lecher
2012-04-21  0:43 Justin Bronder
2012-03-07  1:27 Justin Bronder
2012-01-11 17:39 Justin Bronder
2011-06-24 17:09 Justin Lecher
2011-06-21 11:54 Justin Lecher
2011-05-10 14:30 Justin Bronder
2011-05-05 19:03 Justin Bronder
2011-05-04  4:09 Justin Bronder
2011-05-04  3:48 Justin Bronder
2011-05-04  2:38 Justin Bronder
2011-05-02  1:23 Justin Bronder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox