From: Patrick McLean Date: Mon, 19 Jun 2006 15:12:54 +0000 (+0000) Subject: Add a patch to fix compilation with gcc 4.1. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c422bf85d436075c442fd9f95264ebb47d44a8e;p=gentoo.git Add a patch to fix compilation with gcc 4.1. Package-Manager: portage-2.1_rc4-r2 --- diff --git a/net-analyzer/ns/ChangeLog b/net-analyzer/ns/ChangeLog index c07dc1fc7783..34b7237e5f1d 100644 --- a/net-analyzer/ns/ChangeLog +++ b/net-analyzer/ns/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/ns # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.22 2006/05/15 20:50:24 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.23 2006/06/19 15:12:54 chutzpah Exp $ + + 19 Jun 2006; Patrick McLean + +files/ns-2.29-gcc41.patch, ns-2.29.ebuild: + Add a patch to fix compilation with gcc 4.1. *ns-2.29 (15 May 2006) diff --git a/net-analyzer/ns/Manifest b/net-analyzer/ns/Manifest index a4ae4e1487d9..2dd8a65780a6 100644 --- a/net-analyzer/ns/Manifest +++ b/net-analyzer/ns/Manifest @@ -1,30 +1,34 @@ -AUX ns-2.27-gentoo.diff 11242 RMD160 bb9f6e76676f5f165a15d1c619a6631cf07e13ca SHA1 0b58a8cf044c39de799202d1e6556cf464ff8346 SHA256 c418bf7db4498a43de84bf146492262b893d100acd84e8b8f3e34674b6e04e68 size 11242 +AUX ns-2.27-gentoo.diff 11242 RMD160 bb9f6e76676f5f165a15d1c619a6631cf07e13ca SHA1 0b58a8cf044c39de799202d1e6556cf464ff8346 SHA256 c418bf7db4498a43de84bf146492262b893d100acd84e8b8f3e34674b6e04e68 MD5 f7b94c91182a6e9cf19719c8abd4dfda files/ns-2.27-gentoo.diff 11242 RMD160 bb9f6e76676f5f165a15d1c619a6631cf07e13ca files/ns-2.27-gentoo.diff 11242 SHA256 c418bf7db4498a43de84bf146492262b893d100acd84e8b8f3e34674b6e04e68 files/ns-2.27-gentoo.diff 11242 -AUX ns-2.28-gcc41.patch 1073 RMD160 59ad45b60bffb671484e88949cc0a0e66613afc6 SHA1 ed3c58f7511f612d58a1d7722b5bc278786e4bee SHA256 390a61f2aaceecb87abb6ca99ba2d53510b2d6a0da3177bb05f645ac45749d66 size 1073 +AUX ns-2.28-gcc41.patch 1073 RMD160 59ad45b60bffb671484e88949cc0a0e66613afc6 SHA1 ed3c58f7511f612d58a1d7722b5bc278786e4bee SHA256 390a61f2aaceecb87abb6ca99ba2d53510b2d6a0da3177bb05f645ac45749d66 MD5 ec07875b0d6daf14bbcd40146efc4ea8 files/ns-2.28-gcc41.patch 1073 RMD160 59ad45b60bffb671484e88949cc0a0e66613afc6 files/ns-2.28-gcc41.patch 1073 SHA256 390a61f2aaceecb87abb6ca99ba2d53510b2d6a0da3177bb05f645ac45749d66 files/ns-2.28-gcc41.patch 1073 -AUX ns-2.28-gentoo.diff 2199 RMD160 d9d133c0b77f7df1be0a37a28d309ceef55ac0d4 SHA1 87d49f7a85a09a8e1f08b7f26dadaa437e18005c SHA256 9632f6b55cdb10b49ea600d45e10c6657aefc40b2891781e07676453fecd1d0b size 2199 +AUX ns-2.28-gentoo.diff 2199 RMD160 d9d133c0b77f7df1be0a37a28d309ceef55ac0d4 SHA1 87d49f7a85a09a8e1f08b7f26dadaa437e18005c SHA256 9632f6b55cdb10b49ea600d45e10c6657aefc40b2891781e07676453fecd1d0b MD5 a836c68ff4e3e7d53adf2ba91f47d626 files/ns-2.28-gentoo.diff 2199 RMD160 d9d133c0b77f7df1be0a37a28d309ceef55ac0d4 files/ns-2.28-gentoo.diff 2199 SHA256 9632f6b55cdb10b49ea600d45e10c6657aefc40b2891781e07676453fecd1d0b files/ns-2.28-gentoo.diff 2199 -DIST ns-src-2.28.tar.gz 46599585 RMD160 f2ec76b7dc96bbfb75d8485ef2822ebdf50b8ed1 SHA256 422ffc5b6f4e0a5a4cfddebf97c728703368435800ce77716adaa7472f4faae1 size 46599585 -DIST ns-src-2.29.tar.gz 55291146 RMD160 ff7b0b0cca62eb4f9657f913f56991f22fdfb5ce SHA256 cd78c0eafb4f6f170c3ff9a3e3eace5ff43d1f2abbcb5b18cac67bfe3624bcad size 55291146 -EBUILD ns-2.28.ebuild 2681 RMD160 957dcf99d903d91ffbe3a6bc4d662a2129104faa SHA1 f10285baf7adae5f020ad9c457414c69c495d78b SHA256 a20a02c253c604c838bed4e37c6119ef46e5a91096377ba91771531a82cbc0cd size 2681 +AUX ns-2.29-gcc41.patch 3440 RMD160 67f49146447bab490edac48591ab148a5ec645de SHA1 69851969e1be7abfe791d463d736edb34469a4ef SHA256 3c4b0559079fe7549329bebc3eef205f25448f508f5801152011145a36334d83 +MD5 eb38cb2673e8366474a72a9215c8fc5b files/ns-2.29-gcc41.patch 3440 +RMD160 67f49146447bab490edac48591ab148a5ec645de files/ns-2.29-gcc41.patch 3440 +SHA256 3c4b0559079fe7549329bebc3eef205f25448f508f5801152011145a36334d83 files/ns-2.29-gcc41.patch 3440 +DIST ns-src-2.28.tar.gz 46599585 RMD160 f2ec76b7dc96bbfb75d8485ef2822ebdf50b8ed1 SHA256 422ffc5b6f4e0a5a4cfddebf97c728703368435800ce77716adaa7472f4faae1 +DIST ns-src-2.29.tar.gz 55291146 RMD160 ff7b0b0cca62eb4f9657f913f56991f22fdfb5ce SHA256 cd78c0eafb4f6f170c3ff9a3e3eace5ff43d1f2abbcb5b18cac67bfe3624bcad +EBUILD ns-2.28.ebuild 2681 RMD160 957dcf99d903d91ffbe3a6bc4d662a2129104faa SHA1 f10285baf7adae5f020ad9c457414c69c495d78b SHA256 a20a02c253c604c838bed4e37c6119ef46e5a91096377ba91771531a82cbc0cd MD5 ac636c0a81d57f33b5bc63f51cc64b03 ns-2.28.ebuild 2681 RMD160 957dcf99d903d91ffbe3a6bc4d662a2129104faa ns-2.28.ebuild 2681 SHA256 a20a02c253c604c838bed4e37c6119ef46e5a91096377ba91771531a82cbc0cd ns-2.28.ebuild 2681 -EBUILD ns-2.29.ebuild 3493 RMD160 74e15cbfc784926854af7568c1370fc5a7cb9bb4 SHA1 6f3e73a8be867bf9fda2cfacdb796aed24eace7d SHA256 2fd446bca778fda8962fb0f17e11eb7ab27a0af90f49df925507fbb179aa3fa3 size 3493 -MD5 eea09ef9eb36fa032248379fa27c887e ns-2.29.ebuild 3493 -RMD160 74e15cbfc784926854af7568c1370fc5a7cb9bb4 ns-2.29.ebuild 3493 -SHA256 2fd446bca778fda8962fb0f17e11eb7ab27a0af90f49df925507fbb179aa3fa3 ns-2.29.ebuild 3493 -MISC ChangeLog 2980 RMD160 aea462d23c3aada604dd479b5cffa67b1d7271fb SHA1 b0b97daa21b49683510a4f8659963dab499b7634 SHA256 dc762dd643e51d2a0f4643db52a39c93d8541cc1b26d3a3b5c1bca7c0cceb405 size 2980 -MD5 038c96d956d924be63ee169e0d12c17c ChangeLog 2980 -RMD160 aea462d23c3aada604dd479b5cffa67b1d7271fb ChangeLog 2980 -SHA256 dc762dd643e51d2a0f4643db52a39c93d8541cc1b26d3a3b5c1bca7c0cceb405 ChangeLog 2980 -MISC metadata.xml 279 RMD160 d92abb06d65303feb4a19ce0e392865a6e830835 SHA1 78ff46398326818591d27f1775e57f3a8e5ce2b5 SHA256 cd7225d6a5ad36877aa6ce36825019ec092afcf80b514da29e4798f97554ab36 size 279 +EBUILD ns-2.29.ebuild 3495 RMD160 eee61a3a76d8b44f813e84110030a8d01615cb06 SHA1 77cd95954ff8fbc22e93460279913236434084a5 SHA256 fbfad324418d0511f8033512bb438f9b694e4f009ee24c5a6570571d143740c1 +MD5 17dcd8dc44936fc8156842aac9be0349 ns-2.29.ebuild 3495 +RMD160 eee61a3a76d8b44f813e84110030a8d01615cb06 ns-2.29.ebuild 3495 +SHA256 fbfad324418d0511f8033512bb438f9b694e4f009ee24c5a6570571d143740c1 ns-2.29.ebuild 3495 +MISC ChangeLog 3127 RMD160 9391c0121c100a816902c25309b1e71bea54dcf6 SHA1 048f5ec1924c89bc24459e7dd581078588a90a00 SHA256 6b9275ff673fa47ab756955d469166df082e00b549b2c3f9cf7560e39b0a1742 +MD5 47be9fbaa4398b2f1b5498c0c03b8d14 ChangeLog 3127 +RMD160 9391c0121c100a816902c25309b1e71bea54dcf6 ChangeLog 3127 +SHA256 6b9275ff673fa47ab756955d469166df082e00b549b2c3f9cf7560e39b0a1742 ChangeLog 3127 +MISC metadata.xml 279 RMD160 d92abb06d65303feb4a19ce0e392865a6e830835 SHA1 78ff46398326818591d27f1775e57f3a8e5ce2b5 SHA256 cd7225d6a5ad36877aa6ce36825019ec092afcf80b514da29e4798f97554ab36 MD5 289416ac6a7266e340817717927762a8 metadata.xml 279 RMD160 d92abb06d65303feb4a19ce0e392865a6e830835 metadata.xml 279 SHA256 cd7225d6a5ad36877aa6ce36825019ec092afcf80b514da29e4798f97554ab36 metadata.xml 279 diff --git a/net-analyzer/ns/files/ns-2.29-gcc41.patch b/net-analyzer/ns/files/ns-2.29-gcc41.patch new file mode 100644 index 000000000000..dbe7c01e4e30 --- /dev/null +++ b/net-analyzer/ns/files/ns-2.29-gcc41.patch @@ -0,0 +1,113 @@ +--- sctp/sctp.h.orig 2006-06-16 16:41:37.000000000 -0400 ++++ sctp/sctp.h 2006-06-16 16:42:04.000000000 -0400 +@@ -702,7 +702,7 @@ + + /* debugging functions + */ +- void SctpAgent::DumpSendBuffer(); ++ void DumpSendBuffer(); + + /* sctp association state variable + */ +--- ./mobile/god.h.orig 2006-06-16 16:43:19.000000000 -0400 ++++ ./mobile/god.h 2006-06-16 16:43:41.000000000 -0400 +@@ -85,20 +85,20 @@ + return sqrt(X*X + Y*Y + Z*Z); + } + +- inline void vector::operator=(const vector a) { ++ inline void operator=(const vector a) { + X = a.X; + Y = a.Y; + Z = a.Z; + } +- inline void vector::operator+=(const vector a) { ++ inline void operator+=(const vector a) { + X += a.X; + Y += a.Y; + Z += a.Z; + } +- inline int vector::operator==(const vector a) { ++ inline int operator==(const vector a) { + return (X == a.X && Y == a.Y && Z == a.Z); + } +- inline int vector::operator!=(const vector a) { ++ inline int operator!=(const vector a) { + return (X != a.X || Y != a.Y || Z != a.Z); + } + inline vector operator-(const vector a) { +--- dsr/dsragent.h.orig 2006-06-16 17:04:40.000000000 -0400 ++++ dsr/dsragent.h 2006-06-16 17:05:47.000000000 -0400 +@@ -284,4 +284,7 @@ + static DSRAgent_List agthead; + }; + ++void XmitFlowFailureCallback(Packet *pkt, void *data); ++void XmitFailureCallback(Packet *pkt, void *data); ++ + #endif // _DSRAgent_h +--- diffusion/diffusion.h.orig 2006-06-16 17:08:27.000000000 -0400 ++++ diffusion/diffusion.h 2006-06-16 17:08:45.000000000 -0400 +@@ -208,6 +208,8 @@ + friend class SendBufTimer; + }; + ++void XmitFailedCallback(Packet *pkt, void *data); ++ + #endif + + +--- diffusion/omni_mcast.h.orig 2006-06-16 17:10:46.000000000 -0400 ++++ diffusion/omni_mcast.h 2006-06-16 17:11:00.000000000 -0400 +@@ -225,6 +225,7 @@ + + }; + ++void OmniMcastXmitFailedCallback(Packet *pkt, void *data); + + + #endif +--- tcp/tcp-sack-rh.cc.orig 2006-06-16 17:11:33.000000000 -0400 ++++ tcp/tcp-sack-rh.cc 2006-06-16 17:11:45.000000000 -0400 +@@ -65,7 +65,7 @@ + virtual void estadjust(); + virtual void rhclear(); + virtual void computefack(); +- virtual void SackRHTcpAgent::newack(Packet* pkt); ++ virtual void newack(Packet* pkt); + protected: + int fack_; /* the FACK state variable */ + int retran_data_; /* the number of retransmitted packets in the pipe */ +--- pgm/pgm-agent.cc.orig 2006-06-16 17:12:44.000000000 -0400 ++++ pgm/pgm-agent.cc 2006-06-16 17:12:56.000000000 -0400 +@@ -304,7 +304,7 @@ + + void print_stats(); + +- void PgmAgent::trace_event(char *evType, double evTime); ++ void trace_event(char *evType, double evTime); + + #ifdef PGM_DEBUG + void display_packet(Packet *pkt); +--- pgm/pgm-sender.cc.orig 2006-06-16 17:13:32.000000000 -0400 ++++ pgm/pgm-sender.cc 2006-06-16 17:13:41.000000000 -0400 +@@ -186,7 +186,7 @@ + + void display_packet(Packet *pkt); // For debugging. + +- void PgmSender::trace_event(char *evType, nsaddr_t daddr, double evTime); ++ void trace_event(char *evType, nsaddr_t daddr, double evTime); + + EventTrace * et_; //Trace Object for custom Event Traces + +--- pgm/pgm-receiver.cc.orig 2006-06-16 17:14:37.000000000 -0400 ++++ pgm/pgm-receiver.cc 2006-06-16 17:14:52.000000000 -0400 +@@ -183,7 +183,7 @@ + void print_stats(); + void display_packet(Packet *pkt); // For debugging. + +- void PgmReceiver::trace_event(char *evType, double evTime); ++ void trace_event(char *evType, double evTime); + + EventTrace * et_; //Trace Object for Custom Event Trace + diff --git a/net-analyzer/ns/ns-2.29.ebuild b/net-analyzer/ns/ns-2.29.ebuild index e513cb10a1a8..b7e295baf629 100644 --- a/net-analyzer/ns/ns-2.29.ebuild +++ b/net-analyzer/ns/ns-2.29.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/net-analyzer/ns/ns-2.29.ebuild,v 1.1 2006/05/15 20:50:24 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.29.ebuild,v 1.2 2006/06/19 15:12:54 chutzpah Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -31,7 +31,7 @@ src_unpack() { unpack ${A} cd ${S} # epatch ${FILESDIR}/${P}-gentoo.diff -# epatch ${FILESDIR}/${P}-gcc41.patch + epatch "${FILESDIR}/${P}-gcc41.patch" sed '/$(CC)/s!-g!$(CFLAGS)!g' ${S}/indep-utils/model-gen/Makefile }