Added a compilation fix for gcc 4.1.

(Portage version: 2.1_pre5-r3)

4 files changed, 104 insertions, 5 deletions

diff --git a/dev-util/oprofile/ChangeLog b/dev-util/oprofile/ChangeLog
index ef8b00ba038f..d402b0dd5f12 100644
--- a/dev-util/oprofile/ChangeLog
+++ b/dev-util/oprofile/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/oprofile
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.24 2006/02/12 14:42:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.25 2006/03/05 09:27:29 spock Exp $
+
+  05 Mar 2006; Michał Januszewski <spock@gentoo.org>
+  +files/oprofile-0.9.1-gcc41-compilation-fix.diff, metadata.xml,
+  oprofile-0.9.1-r1.ebuild:
+  Added a compilation fix for gcc 4.1. Patch provided by Francesco Biscani.
 
 *oprofile-0.9.1-r1 (12 Feb 2006)
 *oprofile-0.9-r1 (12 Feb 2006)
diff --git a/dev-util/oprofile/files/oprofile-0.9.1-gcc41-compilation-fix.diff b/dev-util/oprofile/files/oprofile-0.9.1-gcc41-compilation-fix.diff
new file mode 100644
index 000000000000..82938acd351e
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.1-gcc41-compilation-fix.diff
@@ -0,0 +1,93 @@
+--- libpp/arrange_profiles.cpp.orig	2006-02-15 13:26:05.780995781 +0100
++++ libpp/arrange_profiles.cpp	2006-02-15 13:16:37.997633075 +0100
+@@ -24,6 +24,44 @@
+ #include "parse_filename.h"
+ #include "locate_images.h"
+ 
++bool profile_classes::matches(profile_classes const & classes)
++{
++	if (v.size() != classes.v.size())
++		return false;
++
++	axis_types const axis2 = classes.axis;
++
++	switch (axis) {
++		case AXIS_EVENT:
++			break;
++		case AXIS_TGID:
++		case AXIS_TID:
++			return axis2 == AXIS_TID || axis2 == AXIS_TGID;
++		case AXIS_CPU:
++			return axis2 == AXIS_CPU;
++		case AXIS_MAX:
++			return false;
++	}
++
++	// check that the events match (same event, count)
++
++	std::vector<profile_class>::const_iterator it1 = v.begin();
++	std::vector<profile_class>::const_iterator end1 = v.end();
++	std::vector<profile_class>::const_iterator it2 = classes.v.begin();
++
++	while (it1 != end1) {
++		if (it1->ptemplate.event != it2->ptemplate.event)
++			return false;
++		if (it1->ptemplate.count != it2->ptemplate.count)
++			return false;
++		// differing unit mask is considered comparable
++		++it1;
++		++it2;
++	}
++
++	return true;
++}
++
+ using namespace std;
+ 
+ namespace {
+@@ -90,45 +128,6 @@
+ };
+ 
+ 
+-bool profile_classes::matches(profile_classes const & classes)
+-{
+-	if (v.size() != classes.v.size())
+-		return false;
+-
+-	axis_types const axis2 = classes.axis;
+-
+-	switch (axis) {
+-		case AXIS_EVENT:
+-			break;
+-		case AXIS_TGID:
+-		case AXIS_TID:
+-			return axis2 == AXIS_TID || axis2 == AXIS_TGID;
+-		case AXIS_CPU:
+-			return axis2 == AXIS_CPU;
+-		case AXIS_MAX:
+-			return false;
+-	}
+-
+-	// check that the events match (same event, count)
+-
+-	vector<profile_class>::const_iterator it1 = v.begin();
+-	vector<profile_class>::const_iterator end1 = v.end();
+-	vector<profile_class>::const_iterator it2 = classes.v.begin();
+-
+-	while (it1 != end1) {
+-		if (it1->ptemplate.event != it2->ptemplate.event)
+-			return false;
+-		if (it1->ptemplate.count != it2->ptemplate.count)
+-			return false;
+-		// differing unit mask is considered comparable
+-		++it1;
+-		++it2;
+-	}
+-
+-	return true;
+-}
+-
+-
+ /// We have more than one axis of classification, tell the user.
+ void report_error(profile_classes const & classes, axis_types newaxis)
+ {
diff --git a/dev-util/oprofile/metadata.xml b/dev-util/oprofile/metadata.xml
index cbcd6f56e91e..fd37e1470d3c 100644
--- a/dev-util/oprofile/metadata.xml
+++ b/dev-util/oprofile/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>spock@gentoo.org</email>
-  <name>Michal Januszewski</name>
-  <description>Temporary maintainership.</description>
+	<email>spock@gentoo.org</email>
+	<name>Michal Januszewski</name>
+	<description>Temporary maintainership.</description>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-util/oprofile/oprofile-0.9.1-r1.ebuild b/dev-util/oprofile/oprofile-0.9.1-r1.ebuild
index e0d604969313..22c3996855ab 100644
--- a/dev-util/oprofile/oprofile-0.9.1-r1.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.1-r1.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/dev-util/oprofile/oprofile-0.9.1-r1.ebuild,v 1.1 2006/02/12 14:42:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.1-r1.ebuild,v 1.2 2006/03/05 09:27:29 spock Exp $
 
 inherit eutils qt3
 
@@ -23,6 +23,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/oprofile-0.8.2.patch
 	epatch ${FILESDIR}/oprofile-0.9.1-opcontrol_path.diff
+	epatch ${FILESDIR}/oprofile-0.9.1-gcc41-compilation-fix.diff
 }
 
 src_compile() {