From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DA21C1381F3 for ; Wed, 26 Jun 2013 20:38:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8BB81E0930; Wed, 26 Jun 2013 20:38:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1207EE0930 for ; Wed, 26 Jun 2013 20:38:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8F5233E75B for ; Wed, 26 Jun 2013 20:38:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 71F90E468F for ; Wed, 26 Jun 2013 20:38:37 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1372279085.15a39cf4f53ceb7d4ad222f2bbeba859b4677433.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/charm/ChangeLog sys-cluster/charm/charm-6.5.0.ebuild sys-cluster/charm/metadata.xml X-VCS-Directories: sys-cluster/charm/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 15a39cf4f53ceb7d4ad222f2bbeba859b4677433 X-VCS-Branch: master Date: Wed, 26 Jun 2013 20:38:37 +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: 44ed5c4b-6198-4df5-b19a-5659e3b297f6 X-Archives-Hash: 4b10ed41976f095517e6675f53936f08 commit: 15a39cf4f53ceb7d4ad222f2bbeba859b4677433 Author: Nicolas Bock gmail com> AuthorDate: Wed Jun 26 20:38:05 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Wed Jun 26 20:38:05 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=15a39cf4 Added new package: projections A performance analysis framework for Charm++ applications Package-Manager: portage-2.2.0_alpha185 --- sys-cluster/charm/ChangeLog | 5 +++++ sys-cluster/charm/charm-6.5.0.ebuild | 16 +++++++++++++--- sys-cluster/charm/metadata.xml | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index c7d2825..6ad5879 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 26 Jun 2013; Nicolas Bock charm-6.5.0.ebuild, + metadata.xml: + Added new package: projections A performance analysis framework for Charm++ + applications + 26 Jun 2013; Christoph Junghans charm-6.5.0.ebuild: make use of usex diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild index a6a6545..e4a8f4e 100644 --- a/sys-cluster/charm/charm-6.5.0.ebuild +++ b/sys-cluster/charm/charm-6.5.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}.tar.gz" LICENSE="charm" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="charmdebug cmkopt doc examples mpi smp static-libs tcp" +IUSE="charmdebug charmtracing charmproduction cmkopt doc examples mpi smp static-libs tcp" RDEPEND="mpi? ( virtual/mpi )" DEPEND=" @@ -31,7 +31,17 @@ FORTRAN_STANDARD="90" src_prepare() { # Build shared libraries by default. CHARM_OPTS="--build-shared" - CHARM_OPTS+=" --with-$(usex charmdebug charmdebug production)" + if use charmproduction; then + CHARM_OPTS+=" --with-production" + else + if use charmdebug; then + CHARM_OPTS+=" --with-charmdebug" + fi + + if use charmtracing; then + CHARM_OPTS+=" --with-tracing --with-tracing-commthread" + fi + fi # TCP instead of default UDP for socket comunication # protocol @@ -49,7 +59,7 @@ src_prepare() { -e "/CMK_CC/s:gcc:$(usex mpi "mpicc" "$(tc-getCC)"):g" \ -e '/CMK_F90_MODINC/s:-p:-I:g' \ -e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \ - -i src/arch/$(usex mpi && "mpi" "net")-linux*/*sh || die + -i src/arch/$(usex mpi "mpi" "net")-linux*/*sh || die sed \ -e "s:-o conv-cpm:${LDFLAGS} &:g" \ diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml index 37dbe45..0e4959d 100644 --- a/sys-cluster/charm/metadata.xml +++ b/sys-cluster/charm/metadata.xml @@ -4,6 +4,8 @@ sci Enable the charm debugger + Optimize performance of Charm++ runtime + Enable tracing support in Charm++ Enable CMK optimisation Use TCP (instead of UPD) for socket communication