From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 888D2138330 for ; Mon, 29 Aug 2016 20:45:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42DE521C082; Mon, 29 Aug 2016 20:45:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBD8521C075 for ; Mon, 29 Aug 2016 20:45:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E74BF340997 for ; Mon, 29 Aug 2016 20:45:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08B182473 for ; Mon, 29 Aug 2016 20:45:19 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: <1472500666.d223fbab4e43b5b2bb78f3a4df7c3caf3632ab5a.jsbronder@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/mpich/mpich-3.2-r2.ebuild X-VCS-Directories: sys-cluster/mpich/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: d223fbab4e43b5b2bb78f3a4df7c3caf3632ab5a X-VCS-Branch: master Date: Mon, 29 Aug 2016 20:45:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2e127c60-cb1d-45c7-a5e6-ba66735d8c3d X-Archives-Hash: bb603cab721cbef9b054c6466095ebc2 commit: d223fbab4e43b5b2bb78f3a4df7c3caf3632ab5a Author: Christoph Junghans gentoo org> AuthorDate: Mon Aug 29 19:57:46 2016 +0000 Commit: Justin Bronder gentoo 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 \