[gentoo-commits] gentoo-x86 commit in sys-cluster/charm: ChangeLog charm-6.2.0.ebuild

[Justin Lecher (jlec)]

jlec        12/07/01 14:12:34

  Modified:             ChangeLog charm-6.2.0.ebuild
  Log:
  sys-cluster/charm: Build with gcc-4.7, #424379; repact LDFLAGS, #337558
  
  (Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

Revision  Changes    Path
1.33                 sys-cluster/charm/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	15 Feb 2012 19:10:26 -0000	1.32
+++ ChangeLog	1 Jul 2012 14:12:34 -0000	1.33
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/charm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.32 2012/02/15 19:10:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.33 2012/07/01 14:12:34 jlec Exp $
+
+  01 Jul 2012; Justin Lecher <jlec@g.o> charm-6.2.0.ebuild,
+  +files/charm-6.2.0-gcc-4.7.patch:
+  Build with gcc-4.7, #424379; repact LDFLAGS, #337558
 
   15 Feb 2012; Justin Lecher <jlec@g.o> charm-6.1.2-r2.ebuild,
   charm-6.2.0.ebuild, metadata.xml:



1.3                  sys-cluster/charm/charm-6.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild?r1=1.2&r2=1.3

Index: charm-6.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- charm-6.2.0.ebuild	15 Feb 2012 19:10:26 -0000	1.2
+++ charm-6.2.0.ebuild	1 Jul 2012 14:12:34 -0000	1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild,v 1.2 2012/02/15 19:10:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild,v 1.3 2012/07/01 14:12:34 jlec Exp $
 
 EAPI=4
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit eutils flag-o-matic fortran-2 multilib toolchain-funcs
 
 DESCRIPTION="Message-passing parallel language and runtime system"
 HOMEPAGE="http://charm.cs.uiuc.edu/"
@@ -30,7 +30,11 @@
 		CHARM_ARCH="net-linux-amd64" ;;
 esac
 
+FORTRAN_STANDARD="90"
+
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
+
 	# TCP instead of default UDP for socket comunication
 	# protocol
 	if use tcp; then
@@ -47,6 +51,28 @@
 		append-flags -DCMK_OPTIMIZE=1
 	fi
 
+	sed \
+		-e "/CMK_CF90/s:f90:${FC}:g" \
+		-e "/CMK_CXX/s:g++:$(tc-getCXX):g" \
+		-e "/CMK_CC/s:gcc:$(tc-getCC):g" \
+		-e '/CMK_F90_MODINC/s:-p:-I:g' \
+		-e "/CMK_LD/s:\"$: ${LDFLAGS} \":g" \
+		-i src/arch/net-linux*/*sh || die
+
+	sed \
+		-e "s:\(-o conv-cpm\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmxi\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmrun-silent\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmrun-notify\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmrun\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmd_faceless\):${LDFLAGS} \1:g" \
+		-e "s:\(-o charmd\):${LDFLAGS} \1:g" \
+		-i \
+			src/scripts/Makefile \
+			src/arch/net/charmrun/Makefile
+
+	append-cflags -DALLOCA_H
+
 	echo "charm opts: ${CHARM_OPTS}"
 }