Fix test suite compilation with gcc4.3+ (bug #236744).

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc5 x86_64

4 files changed, 49 insertions, 8 deletions

diff --git a/dev-util/oprofile/ChangeLog b/dev-util/oprofile/ChangeLog
index 5797c42a0750..5425159df6c8 100644
--- a/dev-util/oprofile/ChangeLog
+++ b/dev-util/oprofile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/oprofile
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.52 2008/08/20 19:08:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.53 2008/09/06 17:32:32 spock Exp $
+
+  06 Sep 2008; Michał Januszewski <spock@gentoo.org>
+  +files/oprofile-0.9.4-gcc43.patch, oprofile-0.9.4.ebuild:
+  Fix test suite compilation with gcc4.3+ (bug #236744).
 
   20 Aug 2008; Michał Januszewski <spock@gentoo.org> oprofile-0.9.4.ebuild:
   Add a check for CONFIG_OPROFILE in the kernel's .config (bug #235285).
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index bd78a76b1015..966d7ecb4715 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX oprofile-0.9.3-gcc43.patch 7398 RMD160 bf6bab5b7d1fe489a0992940cc893a1db82acc03 SHA1 4c502e095bdc2128b9891525f86d97fa614880a5 SHA256 c217da3603574d43312f50a3298705fde96cc4148aeb6f44c20a3367db7fb69e
+AUX oprofile-0.9.4-gcc43.patch 763 RMD160 a7b8ed320ca1a2dca5b027d62ae372fc5e694cfe SHA1 b4f2c2949151906a0b3dc3667b1d338e97756a2b SHA256 a41cf6f4e4319ba7d45956bd1df4af8463dcaa8e5c4b1cad1762d61f33e4a2b9
 DIST oprofile-0.9.3.tar.gz 853593 RMD160 adcacb204b9061aebf761d6545e4f0b1ba1c4608 SHA1 88aab6c2259423548977d8485467aee98b35ed33 SHA256 4f86ab165dabcc7bc4008710a66fa0ed391c083e2a8bdf8a8f5bf11c0244b2cb
 DIST oprofile-0.9.4.tar.gz 1229744 RMD160 5653f852a4d67edeedacb51e8f0c02ec8e165377 SHA1 8609b6bec7769eaaf8b8703ecde33f18f8a8a195 SHA256 cb1452159036ba7d3003b75dfef38fcbc61503f76adfca2879ebf7766931cade
 EBUILD oprofile-0.9.3.ebuild 2008 RMD160 c55ff9d03e8652c94ca40271c78865feafa810c8 SHA1 a50caf92d3cb108d45ab9e113a76d888281f3c43 SHA256 8ef32a1058ff322f3f8fb7c8dfa54a610cee3cdfc9de23c2a046327cb6810bcf
-EBUILD oprofile-0.9.4.ebuild 2142 RMD160 c03e1bc573b5124417b64bdfd589f4078a2a1924 SHA1 6422384aa9eb603b3f474c4c201aa4b1395a05dd SHA256 d49ececa399d07fda43e741488a79e64b66cb4f3a622fbb828317b55656c7e1a
-MISC ChangeLog 7179 RMD160 04c78a131cdd17e28da6cf7858c20784b789fc63 SHA1 1c87bc03b3c9a85faffbc6715b7aeb7a86e57935 SHA256 14993df2e6cd710dc4ba67f2b915db6ec0b0c300c6b5faab29afa17f302da8b7
+EBUILD oprofile-0.9.4.ebuild 2155 RMD160 3af8f724b1eae94782766f385897f10a0e24b441 SHA1 b0913682aaba427405fe73bc45ba7d54bb57c417 SHA256 ed47439611244c0f8352407b91fa767f3978043c2783c1a9c8ce7709787ca211
+MISC ChangeLog 7351 RMD160 167c7d86d68178cd359b49f8358825bcd7fcd907 SHA1 f60d7130f80603348f7581c083f334a9074fb74d SHA256 a23af5cfb5ce63fd59b8ed4bc40780461e41b1ae762cbfb69ef505474f9e5909
 MISC metadata.xml 307 RMD160 c409719a8668e511d68d18b694941a938d6fcf60 SHA1 c547c9982ae42542ad182642ca3d5608f83e202a SHA256 0df423537a6bebf20bf0422e63cc497468f4926c27c0025c8703db116cdefb69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkisa60ACgkQchej4aZK9/fvHgCghVykKBnmDrsTbyi8El7mYGGz
-xi8An0cfRCleqVZYMQrBXP969MjX5im3
-=Bqb9
+iEYEARECAAYFAkjCvp4ACgkQchej4aZK9/eoZwCdGwFRAcMIGyDHG68G8UrJmLQk
+uDEAn0aE5brUDSeCLGLLFwoK/Hye1t/4
+=iorw
 -----END PGP SIGNATURE-----
diff --git a/dev-util/oprofile/files/oprofile-0.9.4-gcc43.patch b/dev-util/oprofile/files/oprofile-0.9.4-gcc43.patch
new file mode 100644
index 000000000000..2acc961ea05f
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.4-gcc43.patch
@@ -0,0 +1,31 @@
+--- libregex/tests/java_test.cpp.old	2008-09-03 00:57:19.357004497 +0200
++++ libregex/tests/java_test.cpp	2008-09-03 00:57:38.234025373 +0200
+@@ -16,6 +16,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstdlib>
+ 
+ using namespace std;
+ 
+--- libregex/tests/regex_test.cpp.old	2008-09-03 00:55:18.564005266 +0200
++++ libregex/tests/regex_test.cpp	2008-09-03 00:55:43.576001018 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cstdlib>
+ 
+ using namespace std;
+ 
+--- libabi/tests/abi_test.cpp.old	2005-08-17 21:15:42.000000000 +0200
++++ libabi/tests/abi_test.cpp	2008-09-03 01:00:04.091003916 +0200
+@@ -17,6 +17,8 @@
+ 
+ #include <fstream>
+ #include <iostream>
++#include <cstring>
++#include <cstdlib>
+ 
+ using namespace std;
+ 
diff --git a/dev-util/oprofile/oprofile-0.9.4.ebuild b/dev-util/oprofile/oprofile-0.9.4.ebuild
index 1daff42b79c7..f15f061f5cf9 100644
--- a/dev-util/oprofile/oprofile-0.9.4.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.4.ebuild,v 1.3 2008/08/20 19:08:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.4.ebuild,v 1.4 2008/09/06 17:32:32 spock Exp $
 
 EAPI=1
 
@@ -13,7 +13,6 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-# IUSE: it also needs kernel sources but all gentoo users have them
 IUSE="qt3"
 DEPEND=">=dev-libs/popt-1.7-r1
 	>=sys-devel/binutils-2.14.90.0.6-r3
@@ -28,6 +27,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
 src_compile() {
 	local myconf=""