From 8da82b2223efd66cd5bcb35a83aeb79fc073bb40b0e0d4d0f29c1b7d2222d82a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sat, 2 Jul 2016 19:07:40 +0000
Subject: [PATCH] Accepting request 406102 from
 home:MargueriteSu:branches:devel:tools

OBS-URL: https://build.opensuse.org/request/show/406102
OBS-URL: https://build.opensuse.org/package/show/devel:tools/oprofile?expand=0&rev=40
---
 oprofile-1.1.0-gcc6.patch | 30 ++++++++++++++++++++++++++++++
 oprofile.changes          |  9 +++++++++
 oprofile.spec             |  6 ++++--
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 oprofile-1.1.0-gcc6.patch

diff --git a/oprofile-1.1.0-gcc6.patch b/oprofile-1.1.0-gcc6.patch
new file mode 100644
index 0000000..0640d77
--- /dev/null
+++ b/oprofile-1.1.0-gcc6.patch
@@ -0,0 +1,30 @@
+From: William Cohen <wcohen@redhat.com>
+Subject: Fix FTBFS problem with GCC-6
+Date: 2016-02-05
+References: boo#985359
+Upstream: yes
+
+GCC-6 is pickier about some of the type conversions.
+Avoid the intermediate bool type to make GCC-6 happy.
+
+Index: b/libutil++/op_bfd.cpp
+===================================================================
+--- a/libutil++/op_bfd.cpp
++++ b/libutil++/op_bfd.cpp
+@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_ind
+ {
+ 	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/oprofile.changes b/oprofile.changes
index e05c55a..c06b2b5 100644
--- a/oprofile.changes
+++ b/oprofile.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Jul  2 18:17:27 UTC 2016 - i@marguerite.su
+
+- add patch: oprofile-1.1.0-gcc6.patch, fixed boo#985359
+  * cherry picked upstream commit 39d4d4, so please
+    remember to drop it next release
+  * GCC 6 is pickier about some of the type conversions 
+    avoid the intermediate bool type to make it happy
+
 -------------------------------------------------------------------
 Fri Dec 25 10:07:44 UTC 2015 - mpluskal@suse.com
 
diff --git a/oprofile.spec b/oprofile.spec
index 3d8c0fb..5e4ce7e 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package oprofile
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,8 @@ Source4:        jvmpi.h
 Source5:        README-BEFORE-ADDING-PATCHES
 Patch1:         %{name}-no-libjvm-version.patch
 Patch2:         %{name}-pfm-ppc.patch
+# PATCH FIX UPSTREAM marguerite@opensuse.org - fix FTBFS gcc6
+Patch3:         %{name}-%{version}-gcc6.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  binutils-devel
@@ -102,6 +104,7 @@ from supported virtual machines.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 mkdir -p java/include
 # copy files necessary to build Java agent libraries
@@ -135,7 +138,6 @@ rm -f %{buildroot}%{_libdir}/oprofile/libopagent.*a
 %{_sbindir}/useradd -r -g oprofile -d %{_localstatedir}/lib/empty -s /bin/false -c "Special user account to be used by OProfile" oprofile 2>/dev/null || :
 
 %post -n libopagent1 -p /sbin/ldconfig
-
 %postun -n libopagent1 -p /sbin/ldconfig
 
 %files