Added patch to fix compile problems with gcc-4.1. This fixes bug #130374.

(Portage version: 2.1_pre7-r5)

4 files changed, 61 insertions, 8 deletions

diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog
index 4caa2763e07c..225003c940b6 100644
--- a/sys-cluster/charm/ChangeLog
+++ b/sys-cluster/charm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/charm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.6 2006/04/07 20:17:13 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/ChangeLog,v 1.7 2006/04/21 02:58:35 markusle Exp $
+
+  21 Apr 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/charm-5.9-gcc4.patch, charm-5.9.ebuild:
+  Added patch to fix compile problems with gcc-4.1. Thanks much to
+  Brady Catherman <bradyc@uidaho.edu> for his help with debugging.
+  This fixes bug #130374.
 
   07 Apr 2006; Markus Dittrich <markusle@gentoo.org>
   +files/charm-examples-gentoo.patch, charm-5.9.ebuild:
diff --git a/sys-cluster/charm/Manifest b/sys-cluster/charm/Manifest
index c89e5d826a10..bef1e5a5f724 100644
--- a/sys-cluster/charm/Manifest
+++ b/sys-cluster/charm/Manifest
@@ -1,9 +1,12 @@
-MD5 7daa41891b0a2f0641df83025bc3d847 ChangeLog 1610
-RMD160 1e2d1f98166b76198c83d7d6a021f88adae889b8 ChangeLog 1610
-SHA256 e6c8a565894488eef1588a367710c01a7810870ae62f414a26a4806b3e7caeda ChangeLog 1610
-MD5 04fc3d19f68c07812a8a31fcae7d68ce charm-5.9.ebuild 3690
-RMD160 e8d48cc1619cfeb8970e53c221c3737fc6d06c55 charm-5.9.ebuild 3690
-SHA256 6bfdf3c90c0542b71ffaffe91977df9c6d3e13d933c30b0c7e5704bc58ef3569 charm-5.9.ebuild 3690
+MD5 3744d104368d0b82f577d49639a7d0ac ChangeLog 1873
+RMD160 ba8c1d23d8475573b9fb4d371623f9a6b85b8a93 ChangeLog 1873
+SHA256 5899976b399ded9a1c248e53db5bb58e0689beb583fd3ea15a37dcbf8b9ff0e3 ChangeLog 1873
+MD5 6e73c6d541d53d6b4cf2ea447fb92b91 charm-5.9.ebuild 3746
+RMD160 b89ae87927ccc85d8ca7bf8db518d7bb68564d0d charm-5.9.ebuild 3746
+SHA256 163d13a2b86b1f2227670a965f5228a49c5ab7a9ae9a0f2a0c00bbb52e0daef5 charm-5.9.ebuild 3746
+MD5 11756cffab21eac69a9d4f8c371b4ccc files/charm-5.9-gcc4.patch 1701
+RMD160 7b28484b9f956fb310fc5f7bbbfb2c896a12081d files/charm-5.9-gcc4.patch 1701
+SHA256 5d1ccf611c8f40c4e6572fcf1bb8cae1f0339a158df7bd698efcd396c28777cc files/charm-5.9-gcc4.patch 1701
 MD5 0b343e0d9021a96327bd9255a3ed885d files/charm-charmc-gentoo.patch 1078
 RMD160 f84f49f0ced57c842f1fefe24623581b94fddde8 files/charm-charmc-gentoo.patch 1078
 SHA256 b903a12c4817268abf6d5797ea8cf5cfcae7ff09b969c1f073ffc08b0afbff7b files/charm-charmc-gentoo.patch 1078
diff --git a/sys-cluster/charm/charm-5.9.ebuild b/sys-cluster/charm/charm-5.9.ebuild
index 15ed557f52b8..ce41b5712f39 100644
--- a/sys-cluster/charm/charm-5.9.ebuild
+++ b/sys-cluster/charm/charm-5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.5 2006/04/07 20:17:15 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/charm/charm-5.9.ebuild,v 1.6 2006/04/21 02:58:35 markusle Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -51,6 +51,9 @@ src_unpack() {
 	# enable proper detection of python in configure
 	epatch "${FILESDIR}"/${PN}-python-configure-gentoo.patch
 
+	# gcc-4.1 fixes
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+
 	# TCP instead of default UDP for socket comunication
 	# protocol
 	if use tcp; then
diff --git a/sys-cluster/charm/files/charm-5.9-gcc4.patch b/sys-cluster/charm/files/charm-5.9-gcc4.patch
new file mode 100644
index 000000000000..9a1cb9f1d1d9
--- /dev/null
+++ b/sys-cluster/charm/files/charm-5.9-gcc4.patch
@@ -0,0 +1,41 @@
+diff -Naur charm-5.9/src/ck-com/MsgPacker.h charm-5.9-new/src/ck-com/MsgPacker.h
+--- charm-5.9/src/ck-com/MsgPacker.h	2005-03-20 23:21:51.000000000 -0600
++++ charm-5.9-new/src/ck-com/MsgPacker.h	2006-04-19 17:16:05.000000000 -0500
+@@ -83,7 +83,7 @@
+     
+     //Takes a queue of envelopes as char* ptrs and not charm message holders
+     //Used by mesh streaming strategy
+-    MsgPacker::MsgPacker(CkQ<char *> &msgq, int n_msgs);
++    MsgPacker(CkQ<char *> &msgq, int n_msgs);
+     
+     void getMessage(CombinedMessage *&msg, int &size);
+     static void deliver(CombinedMessage *cmb_msg);
+diff -Naur charm-5.9/src/ck-core/charisma.h charm-5.9-new/src/ck-core/charisma.h
+--- charm-5.9/src/ck-core/charisma.h	2003-03-20 18:30:50.000000000 -0600
++++ charm-5.9-new/src/ck-core/charisma.h	2006-04-19 17:19:34.000000000 -0500
+@@ -295,6 +295,7 @@
+ class CharismaInPort
+ {
+   public:
++    virtual ~CharismaInPort() {}
+     virtual void send(void *msg, int len) = 0;
+     void _create(const char *name)
+     {
+@@ -307,6 +308,7 @@
+   protected:
+     CharismaInPort *inport;
+   public:
++    virtual ~CharismaOutPort() {}
+     virtual void emitData(void *data, int len)
+     {
+       inport->send(data, len);
+diff -Naur charm-5.9/src/ck-core/cklocation.h charm-5.9-new/src/ck-core/cklocation.h
+--- charm-5.9/src/ck-core/cklocation.h	2004-10-30 11:35:25.000000000 -0500
++++ charm-5.9-new/src/ck-core/cklocation.h	2006-04-19 17:21:24.000000000 -0500
+@@ -431,6 +431,7 @@
+ /// Abstract superclass of all array manager objects 
+ class CkArrMgr {
+ public:
++	virtual ~CkArrMgr() {}
+ 	/// Insert this initial element on this processor
+ 	virtual void insertInitial(const CkArrayIndex &idx,void *ctorMsg, int local=1)=0;