pool/oprofile
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 406102 from home:MargueriteSu:branches:devel:tools

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/406102
OBS-URL: https://build.opensuse.org/package/show/devel:tools/oprofile?expand=0&rev=40
This commit is contained in:
Marcus Meissner 2016-07-02 19:07:40 +00:00 committed by Git OBS Bridge
parent dfd2c0e8d0
commit 8da82b2223
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
oprofile-1.1.0-gcc6.patch Normal file
View File

@ -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));

9
oprofile.changes
View File

@ -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

6
oprofile.spec
View File

@ -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