summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2011-06-12 12:45:57 +0000
committerMichael Januszewski <spock@gentoo.org>2011-06-12 12:45:57 +0000
commit0f03588abd88181b0844ac5685aaac585f330a53 (patch)
tree9bd0624099fc6f4b8b71d11b91d8212245fa26fa /dev-util
parentInitial version. New package: library for deep evaluation of data structures. (diff)
downloadhistorical-0f03588abd88181b0844ac5685aaac585f330a53.tar.gz
historical-0f03588abd88181b0844ac5685aaac585f330a53.tar.bz2
historical-0f03588abd88181b0844ac5685aaac585f330a53.zip
Add upstream build fix for GCC 4.6 (bug #363259).
Package-Manager: portage-2.1.10.2/cvs/Linux x86_64
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/oprofile/ChangeLog6
-rw-r--r--dev-util/oprofile/Manifest15
-rw-r--r--dev-util/oprofile/files/oprofile-0.9.6-mutable.patch19
-rw-r--r--dev-util/oprofile/oprofile-0.9.6.ebuild8
4 files changed, 44 insertions, 4 deletions
diff --git a/dev-util/oprofile/ChangeLog b/dev-util/oprofile/ChangeLog
index 883852184ebe..710fafdb50f0 100644
--- a/dev-util/oprofile/ChangeLog
+++ b/dev-util/oprofile/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/oprofile
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.66 2011/05/22 16:41:59 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/ChangeLog,v 1.67 2011/06/12 12:45:57 spock Exp $
+
+ 12 Jun 2011; Michał Januszewski <spock@gentoo.org> oprofile-0.9.6.ebuild,
+ +files/oprofile-0.9.6-mutable.patch:
+ Add upstream build fix for GCC 4.6 (bug #363259).
22 May 2011; Matt Turner <mattst88@gentoo.org> oprofile-0.9.6.ebuild:
Add ~alpha keyword
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 6759be77120e..2a3a5e18c24c 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX oprofile-0.9.6-mutable.patch 537 RMD160 a10427d2ac352250f8dbc40a242ca5477688c37b SHA1 eb1706977c60abf079f1f418f83cf51fa6c76d1d SHA256 0d0d4394408a5392854cdec9453b51a3347a4350c503c7a1eb2ef1ae83dff413
DIST oprofile-0.9.6.tar.gz 1321536 RMD160 95af7d4b698ac9f93567e7906e501f29949e96a0 SHA1 cc62cc58c574e235bc146c8ddc9d9a9af0972fd1 SHA256 3f0dd40a7749fc650d25d79d42ebbff8f3b6db310c36e7c3839696cc09077880
-EBUILD oprofile-0.9.6.ebuild 1719 RMD160 f166dc00b86c7119f06a32301b5dc217b12966fb SHA1 fc8145b9fcdee922687201c63b91b161a7b2131f SHA256 68df4c4364c12a8da675abfeb0cad064e93637f127caf54304a63b4946bc3103
-MISC ChangeLog 9165 RMD160 b6384b2bfa86715627c1120b0745864b06dbcb33 SHA1 56d093bdb7602924bfe83fb0f5ddc905df8b930c SHA256 e5216942e8fa83c82f73509d2d5c914ae3a83b7387ba2edb102bf2fa92f137b1
+EBUILD oprofile-0.9.6.ebuild 1809 RMD160 dcb7bb09292efacbb68f56d8f8c3fbd5112b071b SHA1 d22e1789d366300158d25be797bd19007aa80080 SHA256 7ad310cf0c5e8b47a7f37dc9ec3dc6d14fe5f8d98aa04fb9521672b7574989bd
+MISC ChangeLog 9331 RMD160 3d08ba9cedac40458116cd0cdc4ca65d622d1c7d SHA1 575bd518dce1eef2f05b4153b91be1e908408bda SHA256 5ad479cad92bdad5976178771c127fb28b971de0fa02c265b3ccb7e238a5b040
MISC metadata.xml 307 RMD160 c409719a8668e511d68d18b694941a938d6fcf60 SHA1 c547c9982ae42542ad182642ca3d5608f83e202a SHA256 0df423537a6bebf20bf0422e63cc497468f4926c27c0025c8703db116cdefb69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk30tRIACgkQchej4aZK9/fyJQCfbb2odLmBGbV8rflyKcFIkxgL
+E2cAn0pPLALNNYfFlGjNYG1E83tNfAPC
+=2OoL
+-----END PGP SIGNATURE-----
diff --git a/dev-util/oprofile/files/oprofile-0.9.6-mutable.patch b/dev-util/oprofile/files/oprofile-0.9.6-mutable.patch
new file mode 100644
index 000000000000..5b06fbdadef0
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-0.9.6-mutable.patch
@@ -0,0 +1,19 @@
+commit b18f60db60487ada38d5f04f52981628b28c6835
+Author: William Cohen <wcohen@redhat.com>
+Date: Wed Feb 9 15:27:47 2011 -0500
+
+ Do not use mutable for reference variable.
+
+diff --git a/libpp/format_output.h b/libpp/format_output.h
+index b6c4592..8e527d5 100644
+--- a/libpp/format_output.h
++++ b/libpp/format_output.h
+@@ -91,7 +91,7 @@ protected:
+ symbol_entry const & symbol;
+ sample_entry const & sample;
+ size_t pclass;
+- mutable counts_t & counts;
++ counts_t & counts;
+ extra_images const & extra;
+ double diff;
+ };
diff --git a/dev-util/oprofile/oprofile-0.9.6.ebuild b/dev-util/oprofile/oprofile-0.9.6.ebuild
index a77e01b3c9d9..5f1dbabed86b 100644
--- a/dev-util/oprofile/oprofile-0.9.6.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.6.ebuild,v 1.7 2011/05/22 16:41:59 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/oprofile/oprofile-0.9.6.ebuild,v 1.8 2011/06/12 12:45:57 spock Exp $
EAPI=1
inherit linux-info
@@ -26,6 +26,12 @@ pkg_setup() {
fi
}
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/oprofile-0.9.6-mutable.patch
+}
+
src_compile() {
local myconf="--with-qt-dir=/void --with-x"