[gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/files/, dev-util/oprofile/

[Andrew Savchenko]

commit:     52be505267c2a9485045472a47990a8eaed6b1fd
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 16:19:59 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 16:21:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52be5052

dev-util/oprofile: fix bug 594178

Add gcc-6 love. Patch from upstream commits by Peter Levine
plevine457/gmail.com.

Package-Manager: portage-2.3.1
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch | 30 +++++++++++++++++++++++
 dev-util/oprofile/oprofile-0.9.9-r1.ebuild        |  3 ++-
 dev-util/oprofile/oprofile-0.9.9-r2.ebuild        |  1 +
 dev-util/oprofile/oprofile-1.1.0-r1.ebuild        |  7 +++++-
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
new file mode 100644
index 00000000..ab3ca7c
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
@@ -0,0 +1,30 @@
+--- a/libop/op_alloc_counter.c
++++ b/libop/op_alloc_counter.c
+@@ -171,7 +171,7 @@
+ 	/* no counters then probably perfmon managing perfmon hw */
+ 	if (nr_counters <= 0) {
+ 		nr_counters = op_get_nr_counters(cpu_type);
+-		unavailable_counters = (~0) << nr_counters;
++		unavailable_counters = (~0U) << nr_counters;
+ 	}
+ 
+ 	/* Check to see if we have enough physical counters to map events*/
+--- a/libutil++/op_bfd.cpp
++++ b/libutil++/op_bfd.cpp
+@@ -535,15 +535,13 @@
+ {
+ 	op_bfd_symbol const & sym = syms[sym_idx];
+ 
+-	bool const verbose = cverb << (vbfd & vlevel1);
+-
+ 	if (anon_obj)
+ 		start = sym.vma();
+ 	else
+ 		start = sym.filepos();
+ 	end = start + sym.size();
+ 
+-	if (!verbose)
++	if (!(cverb << (vbfd & vlevel1)))
+ 		return;
+ 
+ 	io_state state(cverb << (vbfd & vlevel1));

diff --git a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
index ee1c018..65ccf5a 100644
--- a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -50,6 +50,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-gcc-4.9-non-ppc.patch"
 	epatch "${FILESDIR}/${P}-gcc-4.9-unused.patch"
 	epatch "${FILESDIR}/${PN}-1.0.0-athlon.patch"
+	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
 	eautoreconf
 }
 

diff --git a/dev-util/oprofile/oprofile-0.9.9-r2.ebuild b/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
index 95dc5a5..2abc919 100644
--- a/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
@@ -51,6 +51,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-gcc-4.9-non-ppc.patch"
 	epatch "${FILESDIR}/${P}-gcc-4.9-unused.patch"
 	epatch "${FILESDIR}/${PN}-1.0.0-athlon.patch"
+	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
 	eautoreconf
 }
 

diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
index 914d365..6e83c7c 100644
--- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+++ b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="5"
-inherit java-pkg-opt-2 linux-info multilib user
+inherit eutils java-pkg-opt-2 linux-info multilib user
 
 MY_P=${PN}-${PV/_/-}
 DESCRIPTION="A transparent low-overhead system-wide profiler"
@@ -43,6 +43,11 @@ pkg_setup() {
 	use java && java-pkg_init
 }
 
+src_prepare() {
+	# fix bug #594178
+	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
+}
+
 src_configure() {
 	econf \
 		--disable-werror \