[gentoo-commits] proj/sci:master commit in: sys-cluster/charm/

["Nicolas Bock" <nicolasbock@gmail.com>]

commit:     4035cbb8e5ba1e29440634b0cb256e5583e9c02c
Author:     Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
AuthorDate: Thu Jun  6 02:48:15 2013 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gmail <DOT> 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 @@
 <pkgmetadata>
 	<herd>sci</herd>
 	<use>
+		<flag name="charmdebug">Enable the charm debugger</flag>
 		<flag name="cmkopt">Enable CMK optimisation</flag>
 		<flag name="tcp">Use TCP (instead of UPD) for socket communication</flag>
 	</use>