public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-cluster/charm: ChangeLog charm-6.2.0.ebuild
@ 2010-04-24  0:00 Donnie Berkholz (dberkholz)
  0 siblings, 0 replies; 2+ messages in thread
From: Donnie Berkholz (dberkholz) @ 2010-04-24  0:00 UTC (permalink / raw
  To: gentoo-commits

dberkholz    10/04/24 00:00:15

  Modified:             ChangeLog
  Added:                charm-6.2.0.ebuild
  Log:
  Bump.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.29                 sys-cluster/charm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/ChangeLog?r1=1.28&r2=1.29

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog	23 Apr 2010 19:09:32 -0000	1.28
+++ ChangeLog	24 Apr 2010 00:00:15 -0000	1.29
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/charm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.28 2010/04/23 19:09:32 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.29 2010/04/24 00:00:15 dberkholz Exp $
+
+*charm-6.2.0 (24 Apr 2010)
+
+  24 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>; +charm-6.2.0.ebuild:
+  Bump.
 
   23 Apr 2010; Donnie Berkholz <dberkholz@gentoo.org>;
   charm-6.1.2-r2.ebuild:



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

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/charm/charm-6.2.0.ebuild?rev=1.1&content-type=text/plain

Index: charm-6.2.0.ebuild
===================================================================
# Copyright 1999-2010 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.1 2010/04/24 00:00:15 dberkholz Exp $

EAPI=2
inherit eutils toolchain-funcs flag-o-matic multilib

DESCRIPTION="Charm++ is a message-passing parallel language and runtime system."
LICENSE="charm"
HOMEPAGE="http://charm.cs.uiuc.edu/"
SRC_URI="http://charm.cs.uiuc.edu/distrib/${P}_src.tar.gz"

LICENSE="charm"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="cmkopt tcp smp doc"

DEPEND="doc? ( >=app-text/poppler-0.12.3-r3[utils]
	dev-tex/latex2html
	virtual/tex-base )"
RDEPEND=""

case ${ARCH} in
	x86)
		CHARM_ARCH="net-linux" ;;

	amd64)
		CHARM_ARCH="net-linux-amd64" ;;
esac

src_prepare() {
	# TCP instead of default UDP for socket comunication
	# protocol
	if use tcp; then
		CHARM_OPTS="${CHARM_OPTS} tcp"
	fi

	# enable direct SMP support using shared memory
	if use smp; then
		CHARM_OPTS="${CHARM_OPTS} smp"
	fi

	# CMK optimization
	if use cmkopt; then
		append-flags -DCMK_OPTIMIZE=1
	fi

	echo "charm opts: ${CHARM_OPTS}"
}

src_compile() {
	# build charmm++ first
	cd "${S}"
	./build charm++ ${CHARM_ARCH} ${CHARM_OPTS} ${CFLAGS} || \
		die "Failed to build charm++"

	# make pdf/html docs
	if use doc; then
		cd "${S}"/doc
		make doc || die "failed to create pdf/html docs"
	fi
}

src_install() {
	# make charmc play well with gentoo before
	# we move it into /usr/bin
	epatch "${FILESDIR}/charm-6.1.2-charmc-gentoo.patch"

	sed -e "s|gentoo-include|${P}|" \
		-e "s|gentoo-libdir|$(get_libdir)|g" \
		-e "s|VERSION|${P}/VERSION|" \
		-i ./src/scripts/charmc || die "failed patching charmc script"

	# install binaries
	cd "${S}"/bin
	dobin ./charmd ./charmd_faceless ./charmr* ./charmc ./charmxi \
		./conv-cpm ./dep.pl || die "Failed to install binaries"

	# install headers
	cd "${S}"/include
	insinto /usr/include/${P}
	doins * || die "failed to install header files"

	# install static libs
	# charm has a lot of .o "libs" that it requires at runtime
	cd "${S}"/lib
	dolib.a *.{a,o} || die "failed to install static libs"

	# install shared libs
	cd "${S}"/lib_so
	dolib.so *.so* || die "failed to install shared libs"

	# basic docs
	cd "${S}"
	dodoc CHANGES README  || die "Failed to install docs"

	# install examples
	find examples/ -name 'Makefile' | xargs sed \
		-r "s:(../)+bin/charmc:/usr/bin/charmc:" -i || \
		die "Failed to fix examples"
	find examples/ -name 'Makefile' | xargs sed \
		-r "s:./charmrun:./charmrun ++local:" -i || \
		die "Failed to fix examples"
	insinto /usr/share/doc/${PF}/examples
	doins -r examples/charm++/*

	# pdf/html docs
	if use doc; then
		cd "${S}"/doc
		# install pdfs
		insinto /usr/share/doc/${PF}/pdf
		doins  doc/pdf/* || die "failed to install pdf docs"
		# install html
		docinto html
		dohtml -r doc/html/* || die "failed to install html docs"
	fi
}

pkg_postinst() {
	echo
	einfo "Please test your charm installation by copying the"
	einfo "content of /usr/share/doc/${PF}/examples to a"
	einfo "temporary location and run 'make test'."
	echo
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-cluster/charm: ChangeLog charm-6.2.0.ebuild
@ 2012-07-01 14:12 Justin Lecher (jlec)
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2012-07-01 14:12 UTC (permalink / raw
  To: gentoo-commits

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@gentoo.org> 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@gentoo.org> 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}"
 }
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-07-01 14:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-24  0:00 [gentoo-commits] gentoo-x86 commit in sys-cluster/charm: ChangeLog charm-6.2.0.ebuild Donnie Berkholz (dberkholz)
  -- strict thread matches above, loose matches on Subject: below --
2012-07-01 14:12 Justin Lecher (jlec)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox