public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2015-02-17  0:13 Christoph Junghans
  0 siblings, 0 replies; 14+ messages in thread
From: Christoph Junghans @ 2015-02-17  0:13 UTC (permalink / raw
  To: gentoo-commits

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

added multilib mpi for testing

Package-Manager: portage-2.2.14

---
 sys-cluster/mpich/ChangeLog             |   8 +-
 sys-cluster/mpich/mpich-3.1.3-r1.ebuild | 127 ++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index deb211c..719cc52 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-cluster/mpich
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich-3.1.3-r1 (17 Feb 2015)
+
+  17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +mpich-3.1.3-r1.ebuild:
+  added multilib mpi for testing
+
 *mpich-3.0.4 (09 Jul 2013)
 
   09 Jul 2013; Justin Bronder <jsbronder@gentoo.org> +mpich-3.0.4.ebuild,
   +.mpich-3.0.4.ebuild.swp, +files/eselect.mpi.mpich, +metadata.xml:
   Initial commit, upstream package move from sys-cluster/mpich2 and bump
-

diff --git a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild b/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
new file mode 100644
index 0000000..3aea437
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich/mpich-3.1.3.ebuild,v 1.1 2014/10/16 04:50:05 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.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich"
+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/mpich2
+	!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 MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.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
+
+	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	export MPICHLIB_CFLAGS=${CFLAGS}
+	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
+	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
+	export MPICHLIB_FFLAGS=${FFLAGS}
+	export MPICHLIB_FCFLAGS=${FCFLAGS}
+	export MPICHLIB_LDFLAGS=${LDFLAGS}
+	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	ECONF_SOURCE=${S} econf ${c} \
+		--with-pm=hydra \
+		--disable-mpe \
+		--disable-fast \
+		--enable-smpcoll \
+		--enable-versioning \
+		--with-hwloc-prefix=/usr \
+		$(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 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] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2015-02-20  2:01 Christoph Junghans
  0 siblings, 0 replies; 14+ messages in thread
From: Christoph Junghans @ 2015-02-20  2:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1c86c56373e97a238b5b4655b77d3cff04ee8ec7
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 01:58:36 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 01:58:36 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=1c86c563

disable natvie fortran

Package-Manager: portage-2.2.14

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

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

diff --git a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild b/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
index 3aea437..e0797c2 100644
--- a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
+++ b/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
@@ -97,7 +97,7 @@ multilib_src_configure() {
 		--with-hwloc-prefix=/usr \
 		$(use_enable romio) \
 		$(use_enable cxx) \
-		$(use_enable fortran fortran all)
+		$(multilib_native_use_enable fortran fortran all)
 }
 
 multilib_src_test() {
@@ -108,7 +108,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] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2015-02-21  2:46 Christoph Junghans
  0 siblings, 0 replies; 14+ messages in thread
From: Christoph Junghans @ 2015-02-21  2:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4c8095d969a8fef206270703f8571ec6dd36513f
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 02:45:46 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=4c8095d9

added fortran hack for bug #540508

Package-Manager: portage-2.2.14

---
 sys-cluster/mpich/ChangeLog             |  3 +++
 sys-cluster/mpich/mpich-3.1.3-r1.ebuild | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index 77d6182..3b7b197 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Feb 2015; Christoph Junghans <ottxor@gentoo.org> mpich-3.1.3-r1.ebuild:
+  added fortran hack for bug #540508
+
   20 Feb 2015; Christoph Junghans <ottxor@gentoo.org> mpich-3.1.3-r1.ebuild:
   disable natvie fortran
 

diff --git a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild b/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
index e0797c2..52e1276 100644
--- a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
+++ b/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
@@ -36,7 +36,6 @@ 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
 )
 
@@ -107,13 +106,20 @@ multilib_src_test() {
 multilib_src_install() {
 	default
 
-	#fortran modules are arch-specific, follow OpenMPI and put them in lib
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
-		mv "${ED}"/usr/include/*.mod "${ED}"/usr/$(get_libdir) || die
+		mkdir "${T}"/fortran || die
+		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/usr/include/*.mod "${T}"/fortran || die
 	fi
 }
 
 multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/* "${ED}"/usr/include || die
+	fi
+
 	dodir /usr/share/doc/${PF}
 	dodoc README{,.envvar} CHANGES RELEASE_NOTES
 	newdoc src/pm/hydra/README README.hydra


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

commit:     29843cdf120dc60b320ffa7a94da0ae5fcb23d1f
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 16:55:39 2015 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 16:55:39 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=29843cdf

drop keywords from non-empi version

Every other version of the various MPI's supports empi so it was unexpected to
have that dropped.  However this version is still useful for porting/testing.

Package-Manager: portage-2.2.14

 sys-cluster/mpich/ChangeLog                                       | 8 ++++++++
 .../mpich/{mpich-3.1.3-r1.ebuild => mpich-3.1.3-r99.ebuild}       | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index 3b7b197..8630c01 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich-3.1.3-r99 (20 Apr 2015)
+
+  20 Apr 2015; Justin Bronder <jsbronder@gentoo.org> +mpich-3.1.3-r99.ebuild,
+  -mpich-3.1.3-r1.ebuild:
+  drop keywords from non-empi version  Every other version of the various MPI's
+  supports empi so it was unexpected to have that dropped.  However this version
+  is still useful for porting/testing.
+
   21 Feb 2015; Christoph Junghans <ottxor@gentoo.org> mpich-3.1.3-r1.ebuild:
   added fortran hack for bug #540508
 

diff --git a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild b/sys-cluster/mpich/mpich-3.1.3-r99.ebuild
similarity index 97%
rename from sys-cluster/mpich/mpich-3.1.3-r1.ebuild
rename to sys-cluster/mpich/mpich-3.1.3-r99.ebuild
index 0b75e60..0d3d9c0 100644
--- a/sys-cluster/mpich/mpich-3.1.3-r1.ebuild
+++ b/sys-cluster/mpich/mpich-3.1.3-r99.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="mpich"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
 IUSE="+cxx doc fortran mpi-threads romio threads"
 
 COMMON_DEPEND="


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

commit:     ae6d4548536a010dc39e0a6a57817eb741aaf312
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 17:10:55 2015 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 17:10:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ae6d4548

sync with upstream

 sys-cluster/mpich/mpich-3.1.3-r2.ebuild | 122 ++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/sys-cluster/mpich/mpich-3.1.3-r2.ebuild b/sys-cluster/mpich/mpich-3.1.3-r2.ebuild
new file mode 100644
index 0000000..142d511
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.1.3-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2014 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.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	>=sys-apps/hwloc-1.9
+	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.mpich"
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.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 MPICHLIB_CFLAGS=${CFLAGS}
+	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
+	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
+	export MPICHLIB_FFLAGS=${FFLAGS}
+	export MPICHLIB_FCFLAGS=${FCFLAGS}
+	export MPICHLIB_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 \
+		--with-hwloc-prefix=/usr \
+		$(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] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2015-04-20 17:27 Justin Bronder
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Bronder @ 2015-04-20 17:27 UTC (permalink / raw
  To: gentoo-commits

commit:     c168d37f72be1c726ab7b02efea26c2480f3a124
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 17:27:13 2015 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 17:27:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c168d37f

bump

Package-Manager: portage-2.2.14

 sys-cluster/mpich/ChangeLog             |   5 ++
 sys-cluster/mpich/mpich-3.1.4-r1.ebuild | 122 ++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index 8630c01..d3577a5 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mpich-3.1.4-r1 (20 Apr 2015)
+
+  20 Apr 2015; Justin Bronder <jsbronder@gentoo.org> +mpich-3.1.4-r1.ebuild:
+  bump
+
 *mpich-3.1.3-r99 (20 Apr 2015)
 
   20 Apr 2015; Justin Bronder <jsbronder@gentoo.org> +mpich-3.1.3-r99.ebuild,

diff --git a/sys-cluster/mpich/mpich-3.1.4-r1.ebuild b/sys-cluster/mpich/mpich-3.1.4-r1.ebuild
new file mode 100644
index 0000000..ee89bd1
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.1.4-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 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.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	>=sys-apps/hwloc-1.9
+	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.mpich"
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+src_configure() {
+	local c="--enable-shared"
+	local hydra_c="--with-hwloc-prefix=/usr"
+
+	# 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.  Hence the separate
+	# local vars.
+
+	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 MPICHLIB_CFLAGS=${CFLAGS}
+	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
+	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
+	export MPICHLIB_FFLAGS=${FFLAGS}
+	export MPICHLIB_FCFLAGS=${FCFLAGS}
+	export MPICHLIB_LDFLAGS=${LDFLAGS}
+	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	econf $(mpi_econf_args) ${c} \
+		--with-pm=hydra \
+		--disable-fast \
+		--enable-versioning \
+		${hydra_c} \
+		$(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] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2015-11-21 15:14 Christoph Junghans
  0 siblings, 0 replies; 14+ messages in thread
From: Christoph Junghans @ 2015-11-21 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     ba275f139061d2c1402c7de4279b50ba13e0b76d
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 15:14:18 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 15:14:18 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ba275f13

sys-cluster/mpich: bye bye multilib version

Package-Manager: portage-2.2.20.1

 sys-cluster/mpich/ChangeLog              |   3 +
 sys-cluster/mpich/mpich-3.1.3-r99.ebuild | 133 -------------------------------
 2 files changed, 3 insertions(+), 133 deletions(-)

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index d128f04..f95ed1f 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  21 Nov 2015; Christoph Junghans <ottxor@gentoo.org> -mpich-3.1.3-r99.ebuild:
+  sys-cluster/mpich: bye bye multilib version
+
 *mpich-3.1.4-r1 (20 Apr 2015)
 
   20 Apr 2015; Justin Bronder <jsbronder@gentoo.org> +mpich-3.1.4-r1.ebuild:

diff --git a/sys-cluster/mpich/mpich-3.1.3-r99.ebuild b/sys-cluster/mpich/mpich-3.1.3-r99.ebuild
deleted file mode 100644
index 603e1dc..0000000
--- a/sys-cluster/mpich/mpich-3.1.3-r99.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit fortran-2 multilib-minimal
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mpich.org/"
-SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="mpich"
-KEYWORDS=""
-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/mpich2
-	!sys-cluster/openmpi"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/mpicxx.h
-	/usr/include/mpi.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 MPICHLIB_LDFLAGS doesn't seem to fully work.
-	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
-		src/packaging/pkgconfig/mpich.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
-
-	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
-
-	export MPICHLIB_CFLAGS=${CFLAGS}
-	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
-	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
-	export MPICHLIB_FFLAGS=${FFLAGS}
-	export MPICHLIB_FCFLAGS=${FCFLAGS}
-	export MPICHLIB_LDFLAGS=${LDFLAGS}
-	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
-
-	ECONF_SOURCE=${S} econf ${c} \
-		--with-pm=hydra \
-		--disable-mpe \
-		--disable-fast \
-		--enable-smpcoll \
-		--enable-versioning \
-		--with-hwloc-prefix=/usr \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(multilib_native_use_enable fortran fortran all)
-}
-
-multilib_src_test() {
-	emake -j1 check
-}
-
-multilib_src_install() {
-	default
-
-	# fortran header cannot be wrapped (bug #540508), workaround part 1
-	if multilib_is_native_abi && use fortran; then
-		mkdir "${T}"/fortran || die
-		mv "${ED}"/usr/include/mpif* "${T}"/fortran || die
-		mv "${ED}"/usr/include/*.mod "${T}"/fortran || die
-	fi
-}
-
-multilib_src_install_all() {
-	# fortran header cannot be wrapped (bug #540508), workaround part 2
-	if use fortran; then
-		mv "${T}"/fortran/* "${ED}"/usr/include || die
-	fi
-
-	dodir /usr/share/doc/${PF}
-	dodoc 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] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2015-12-21 13:48 Justin Bronder
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Bronder @ 2015-12-21 13:48 UTC (permalink / raw
  To: gentoo-commits

commit:     bc0b32818d361a5e857c58d86d1d736c2e72df19
Author:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 13:47:41 2015 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 13:47:41 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc0b3281

sys-cluster/mpich:  bump 3.2

Package-Manager: portage-2.2.20.1

 sys-cluster/mpich/ChangeLog           |   5 ++
 sys-cluster/mpich/mpich-3.2-r1.ebuild | 122 ++++++++++++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/sys-cluster/mpich/ChangeLog b/sys-cluster/mpich/ChangeLog
index f95ed1f..1d62518 100644
--- a/sys-cluster/mpich/ChangeLog
+++ b/sys-cluster/mpich/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mpich-3.2-r1 (21 Dec 2015)
+
+  21 Dec 2015; Justin Bronder <jsbronder@gentoo.org> +mpich-3.2-r1.ebuild:
+  sys-cluster/mpich:  bump 3.2
+
   21 Nov 2015; Christoph Junghans <ottxor@gentoo.org> -mpich-3.1.3-r99.ebuild:
   sys-cluster/mpich: bye bye multilib version
 

diff --git a/sys-cluster/mpich/mpich-3.2-r1.ebuild b/sys-cluster/mpich/mpich-3.2-r1.ebuild
new file mode 100644
index 0000000..2f0fc84
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.2-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2 mpi
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	>=sys-apps/hwloc-1.9
+	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.mpich"
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+src_configure() {
+	local c="--enable-shared"
+	local hydra_c="--with-hwloc-prefix=/usr"
+
+	# 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.  Hence the separate
+	# local vars.
+
+	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 MPICHLIB_CFLAGS=${CFLAGS}
+	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
+	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
+	export MPICHLIB_FFLAGS=${FFLAGS}
+	export MPICHLIB_FCFLAGS=${FCFLAGS}
+	export MPICHLIB_LDFLAGS=${LDFLAGS}
+	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	econf $(mpi_econf_args) ${c} \
+		--with-pm=hydra \
+		--disable-fast \
+		--enable-versioning \
+		${hydra_c} \
+		$(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] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2016-08-29 20:45 Justin Bronder
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Bronder @ 2016-08-29 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a40fade4c2eb4f40309b042d43b8f25659dfdf09
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 18:45:01 2016 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 18:46:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a40fade4

sys-cluster/mpich: add forgotten mpi_root

Package-Manager: portage-2.2.28

 sys-cluster/mpich/mpich-3.2-r2.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
index 7f5dcf7..d66b32d 100644
--- a/sys-cluster/mpich/mpich-3.2-r2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2-r2.ebuild
@@ -89,18 +89,18 @@ multilib_src_install() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 1
 	if multilib_is_native_abi && use fortran; then
 		mkdir "${T}"/fortran || die
-		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
-		mv "${ED}"usr/include/*.mod "${T}"/fortran || die
+		mv "${ED}"/$(mpi_root)/usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"/$(mpi_root)/usr/include/*.mod "${T}"/fortran || die
 	else
 		# some fortran files get installed unconditionally
-		rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die
+		rm "${ED}"/$(mpi_root)/usr/include/mpif* "${ED}"usr/include/*.mod || die
 	fi
 }
 
 multilib_src_install_all() {
 	# fortran header cannot be wrapped (bug #540508), workaround part 2
 	if use fortran; then
-		mv "${T}"/fortran/* "${ED}"usr/include || die
+		mv "${T}"/fortran/* "${ED}"/$(mpi_root)/usr/include || die
 	fi
 
 	mpi_dodir /usr/share/doc/${PF}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2016-08-29 20:45 Justin Bronder
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Bronder @ 2016-08-29 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     d2354e659f484aab41b16820da9700b404e9b801
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 15:53:42 2016 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 16:47:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d2354e65

sys-cluster/mpich: add multilib version

Package-Manager: portage-2.2.28

 sys-cluster/mpich/mpich-3.2-r2.ebuild | 120 ++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)

diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
new file mode 100644
index 0000000..7f5dcf7
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.2-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD="77 90"
+
+inherit fortran-2 multilib-minimal mpi
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich"
+KEYWORDS=""
+IUSE="+cxx doc fortran mpi-threads romio threads"
+REQUIRED_USE="mpi-threads? ( 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 )
+	$(mpi_imp_deplist)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/mpicxx.h
+	/usr/include/mpi.h
+	/usr/include/opa_config.h
+)
+
+src_prepare() {
+	default
+
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+multilib_src_configure() {
+	# 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.
+
+	export MPICHLIB_CFLAGS="${CFLAGS}"
+	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
+	export MPICHLIB_CXXFLAGS="${CXXFLAGS}"
+	export MPICHLIB_FFLAGS="${FFLAGS}"
+	export MPICHLIB_FCFLAGS="${FCFLAGS}"
+	export MPICHLIB_LDFLAGS="${LDFLAGS}"
+	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	ECONF_SOURCE=${S} $(mpi_econf_args) econf \
+		--enable-shared \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		--with-hwloc-prefix="${EPREFIX}/usr" \
+		--enable-threads=$(usex mpi-threads runtime single) \
+		--with-thread-package=$(usex threads pthreads none) \
+		--with-pm=hydra \
+		--disable-fast \
+		--enable-versioning \
+		--with-hwloc-prefix=/usr \
+		$(mpi_classed && echo "--docdir=$(mpi_root)/usr/share/doc/${PF}") \
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(multilib_native_use_enable fortran fortran all)
+}
+
+multilib_src_test() {
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	# fortran header cannot be wrapped (bug #540508), workaround part 1
+	if multilib_is_native_abi && use fortran; then
+		mkdir "${T}"/fortran || die
+		mv "${ED}"usr/include/mpif* "${T}"/fortran || die
+		mv "${ED}"usr/include/*.mod "${T}"/fortran || die
+	else
+		# some fortran files get installed unconditionally
+		rm "${ED}"usr/include/mpif* "${ED}"usr/include/*.mod || die
+	fi
+}
+
+multilib_src_install_all() {
+	# fortran header cannot be wrapped (bug #540508), workaround part 2
+	if use fortran; then
+		mv "${T}"/fortran/* "${ED}"usr/include || die
+	fi
+
+	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
+
+	local d=$(echo ${ED}/$(mpi_root)/ | sed 's,///*,/,g')
+	if ! use doc; then
+		rm -rf "${d}"usr/share/doc/${PF}/www* || die
+	fi
+
+	MPI_ESELECT_FILE="eselect.mpi.mpich"
+	mpi_imp_add_eselect
+}


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2016-08-29 20:45 Justin Bronder
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Bronder @ 2016-08-29 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     d223fbab4e43b5b2bb78f3a4df7c3caf3632ab5a
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 19:57:46 2016 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 19:57:46 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d223fbab

sys-cluster/mpich: bring back thread logic

Package-Manager: portage-2.2.28

 sys-cluster/mpich/mpich-3.2-r2.ebuild | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
index d66b32d..28dad07 100644
--- a/sys-cluster/mpich/mpich-3.2-r2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2-r2.ebuild
@@ -18,7 +18,6 @@ SLOT="0"
 LICENSE="mpich"
 KEYWORDS=""
 IUSE="+cxx doc fortran mpi-threads romio threads"
-REQUIRED_USE="mpi-threads? ( threads )"
 
 COMMON_DEPEND="
 	>=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]
@@ -53,7 +52,22 @@ src_prepare() {
 multilib_src_configure() {
 	# 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.
+	# are picked up in the children directories.  Hence the separate
+	# local vars.
+
+	local c=
+	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 MPICHLIB_CFLAGS="${CFLAGS}"
 	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
@@ -67,8 +81,7 @@ multilib_src_configure() {
 		--enable-shared \
 		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		--with-hwloc-prefix="${EPREFIX}/usr" \
-		--enable-threads=$(usex mpi-threads runtime single) \
-		--with-thread-package=$(usex threads pthreads none) \
+		${c} \
 		--with-pm=hydra \
 		--disable-fast \
 		--enable-versioning \


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2016-08-29 20:45 Justin Bronder
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Bronder @ 2016-08-29 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     8aa5f237c622b4305b33fdba0c3fab964f1cf945
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 20:03:41 2016 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 20:11:29 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=8aa5f237

sys-cluster/mpich: bring back sysconfdir logic

Package-Manager: portage-2.2.28

 sys-cluster/mpich/mpich-3.2-r2.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
index 33fe443..64ebfc0 100644
--- a/sys-cluster/mpich/mpich-3.2-r2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2-r2.ebuild
@@ -69,6 +69,13 @@ multilib_src_configure() {
 		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 MPICHLIB_CFLAGS="${CFLAGS}"
 	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"
 	export MPICHLIB_CXXFLAGS="${CXXFLAGS}"
@@ -77,16 +84,14 @@ multilib_src_configure() {
 	export MPICHLIB_LDFLAGS="${LDFLAGS}"
 	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
 
-	ECONF_SOURCE=${S} $(mpi_econf_args) econf \
+	ECONF_SOURCE=${S} econf $(mpi_econf_args) \
 		--enable-shared \
-		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		--with-hwloc-prefix="${EPREFIX}/usr" \
 		${c} \
 		--with-pm=hydra \
 		--disable-fast \
 		--enable-versioning \
 		--with-hwloc-prefix=/usr \
-		$(mpi_classed && echo "--docdir=$(mpi_root)/usr/share/doc/${PF}") \
 		$(use_enable romio) \
 		$(use_enable cxx) \
 		$(multilib_native_use_enable fortran fortran all)


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2016-08-29 20:45 Justin Bronder
  0 siblings, 0 replies; 14+ messages in thread
From: Justin Bronder @ 2016-08-29 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     3c184306caac1d028bc6608e8579b83566ee3e01
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 19:58:49 2016 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 19:58:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3c184306

sys-cluster/mpich: re-add keywords for multilib ebuild

Package-Manager: portage-2.2.28

 sys-cluster/mpich/mpich-3.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
index 28dad07..33fe443 100644
--- a/sys-cluster/mpich/mpich-3.2-r2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="mpich"
-KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx doc fortran mpi-threads romio threads"
 
 COMMON_DEPEND="


^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/
@ 2016-08-29 20:49 Christoph Junghans
  0 siblings, 0 replies; 14+ messages in thread
From: Christoph Junghans @ 2016-08-29 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     5d752bc268225622a3238238d44a5b7da904aca9
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 20:49:22 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 20:49:22 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5d752bc2

sys-cluster/mpich: fixed another typo

Package-Manager: portage-2.2.28

 sys-cluster/mpich/mpich-3.2-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-cluster/mpich/mpich-3.2-r2.ebuild b/sys-cluster/mpich/mpich-3.2-r2.ebuild
index 64ebfc0..d0eba49 100644
--- a/sys-cluster/mpich/mpich-3.2-r2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2-r2.ebuild
@@ -91,7 +91,6 @@ multilib_src_configure() {
 		--with-pm=hydra \
 		--disable-fast \
 		--enable-versioning \
-		--with-hwloc-prefix=/usr \
 		$(use_enable romio) \
 		$(use_enable cxx) \
 		$(multilib_native_use_enable fortran fortran all)


^ permalink raw reply related	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2016-08-29 20:49 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-21  2:46 [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2016-08-29 20:49 Christoph Junghans
2016-08-29 20:45 Justin Bronder
2016-08-29 20:45 Justin Bronder
2016-08-29 20:45 Justin Bronder
2016-08-29 20:45 Justin Bronder
2016-08-29 20:45 Justin Bronder
2015-12-21 13:48 Justin Bronder
2015-11-21 15:14 Christoph Junghans
2015-04-20 17:27 Justin Bronder
2015-04-20 17:11 Justin Bronder
2015-04-20 17:11 Justin Bronder
2015-02-20  2:01 Christoph Junghans
2015-02-17  0:13 Christoph Junghans

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