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 22FCD1381F3 for ; Thu, 6 Jun 2013 15:57:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1045E08EA; Thu, 6 Jun 2013 15:57:07 +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 2F7B5E08EA for ; Thu, 6 Jun 2013 15:57:06 +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 172AE33E45E for ; Thu, 6 Jun 2013 15:57:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AC037E468F for ; Thu, 6 Jun 2013 15:57:04 +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: <1370486895.4035cbb8e5ba1e29440634b0cb256e5583e9c02c.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/ X-VCS-Repository: proj/sci X-VCS-Files: 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: 4035cbb8e5ba1e29440634b0cb256e5583e9c02c X-VCS-Branch: master Date: Thu, 6 Jun 2013 15:57:04 +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: 01817002-baa9-48d3-93ab-84ee3637d091 X-Archives-Hash: f6ee43c8e3185e139d4917a753cdab9c commit: 4035cbb8e5ba1e29440634b0cb256e5583e9c02c Author: Nicolas Bock gmail com> AuthorDate: Thu Jun 6 02:48:15 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Thu Jun 6 02:48:15 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4035cbb8 Added USE flag for building the charmdebugger. --- sys-cluster/charm/charm-6.5.0.ebuild | 16 +++++++++++----- sys-cluster/charm/metadata.xml | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sys-cluster/charm/charm-6.5.0.ebuild b/sys-cluster/charm/charm-6.5.0.ebuild index e798d1e..8ae5bec 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="cmkopt doc examples smp static-libs tcp" +IUSE="charmdebug cmkopt doc examples smp static-libs tcp" DEPEND=" doc? ( @@ -22,13 +22,19 @@ DEPEND=" virtual/tex-base )" RDEPEND="" +REQUIRED_USE="charmdebug? ( !cmkopt )" + FORTRAN_STANDARD="90" src_prepare() { - #epatch "${FILESDIR}"/${P}-gcc-4.7.patch + # Build shared libraries by default. + CHARM_OPTS="--build-shared" - # For production, disable debugging features. - CHARM_OPTS="--with-production --build-shared" + if use charmdebug; then + CHARM_OPTS+=" --with-charmdebug" + else + CHARM_OPTS+=" --with-production" + fi # TCP instead of default UDP for socket comunication # protocol @@ -43,7 +49,7 @@ src_prepare() { # CMK optimization if use cmkopt; then - append-flags -DCMK_OPTIMIZE=1 + append-cppflags -DCMK_OPTIMIZE=1 fi sed \ diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml index f555a9f..37dbe45 100644 --- a/sys-cluster/charm/metadata.xml +++ b/sys-cluster/charm/metadata.xml @@ -3,6 +3,7 @@ sci + Enable the charm debugger Enable CMK optimisation Use TCP (instead of UPD) for socket communication