Hello community, here is the log from the commit of package oprofile for openSUSE:Factory checked in at 2016-07-12 23:51:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oprofile (Old) and /work/SRC/openSUSE:Factory/.oprofile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oprofile" Changes: -------- --- /work/SRC/openSUSE:Factory/oprofile/oprofile.changes 2016-01-01 19:49:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oprofile.new/oprofile.changes 2016-07-12 23:51:08.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Jul 2 18:17:27 UTC 2016 - [email protected] + +- 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 + +------------------------------------------------------------------- New: ---- oprofile-1.1.0-gcc6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oprofile.spec ++++++ --- /var/tmp/diff_new_pack.5EWUlQ/_old 2016-07-12 23:51:09.000000000 +0200 +++ /var/tmp/diff_new_pack.5EWUlQ/_new 2016-07-12 23:51:09.000000000 +0200 @@ -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 @@ Source5: README-BEFORE-ADDING-PATCHES Patch1: %{name}-no-libjvm-version.patch Patch2: %{name}-pfm-ppc.patch +# PATCH FIX UPSTREAM [email protected] - fix FTBFS gcc6 +Patch3: %{name}-%{version}-gcc6.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: binutils-devel @@ -102,6 +104,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 mkdir -p java/include # copy files necessary to build Java agent libraries @@ -135,7 +138,6 @@ %{_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 ++++++ oprofile-1.1.0-gcc6.patch ++++++ From: William Cohen <[email protected]> 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));
