From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QHRyw-00046S-1A for garchives@archives.gentoo.org; Wed, 04 May 2011 02:38:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 674801C00A; Wed, 4 May 2011 02:38:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E2931C00A for ; Wed, 4 May 2011 02:38:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2B3A1B400B for ; Wed, 4 May 2011 02:38:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CCA6480505 for ; Wed, 4 May 2011 02:38:20 +0000 (UTC) From: "Justin Bronder" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" Message-ID: Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/mpich2/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/mpich2/ChangeLog sys-cluster/mpich2/mpich2-1.4_rc2.ebuild X-VCS-Directories: sys-cluster/mpich2/ X-VCS-Committer: jsbronder X-VCS-Committer-Name: Justin Bronder X-VCS-Revision: aea0714e38ec718bb3be87da1ea988f8c35400ad Date: Wed, 4 May 2011 02:38:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2053ae118187dbb121e7081c7a44bf9e commit: aea0714e38ec718bb3be87da1ea988f8c35400ad Author: Justin Bronder gentoo org> AuthorDate: Wed May 4 02:38:12 2011 +0000 Commit: Justin Bronder gentoo org> CommitDate: Wed May 4 02:38:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Daea0714e 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: $ =20 + 04 May 2011; Justin Bronder mpich2-1.4_rc2.ebui= ld: + Sync with main tree. Add ~hppa, fix comments, fix #293665 fix. + *mpich2-1.4_rc2 (02 May 2011) =20 02 May 2011; Justin Bronder -mpich2-1.3.ebuild, diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild b/sys-cluster/mpich= 2/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=3D"http://www.mcs.anl.gov/research/projects/mpi= ch2/downloads/tarballs/${MY =20 LICENSE=3D"as-is" SLOT=3D"0" -KEYWORDS=3D"~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS=3D"~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE=3D"+cxx debug doc fortran threads romio mpi-threads" =20 COMMON_DEPEND=3D"dev-libs/libaio @@ -44,17 +44,18 @@ pkg_setup() { } =20 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 =20 - # 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\)=3D"@.*@"|\1=3D""|' \ - src/env/mpi*.in || die + -e 's,\(.*=3D\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \ + src/env/*.conf.in || die } =20 src_configure() {