commit 46fcb93cef90c4052671e55c5ea5059224ec7b09
Author: Jakub Bogusz <[email protected]>
Date: Sat Jul 25 22:10:25 2020 +0200
- updated to 1.4.0
- removed obsolete c++,binutils-2.34 patches
binutils-2.34.patch | 60 -----------------------------------------------------
oprofile-c++.patch | 11 ----------
oprofile.spec | 19 ++++++++---------
3 files changed, 9 insertions(+), 81 deletions(-)
---
diff --git a/oprofile.spec b/oprofile.spec
index 73e3fc3..fa1fe4c 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -1,4 +1,5 @@
# TODO:
+# - java agents
# Warning: The user account 'oprofile:oprofile' does not exist on the system.
# To profile JITed code, this special user account must exist.
# Please ask your system administrator to add the following user and
group:
@@ -9,25 +10,24 @@
Summary: System-wide profiler
Summary(pl.UTF-8): Ogólnosystemowy profiler
Name: oprofile
-Version: 1.1.0
-Release: 11
+Version: 1.4.0
+Release: 1
License: GPL v2 (oprofile), LGPL v2.1+ (libopagent)
Group: Applications/System
Source0:
http://downloads.sourceforge.net/oprofile/%{name}-%{version}.tar.gz
-# Source0-md5: 248c4c069f9476f427fa7195563f9867
-Patch0: %{name}-c++.patch
-Patch1: binutils-2.34.patch
+# Source0-md5: ac0ff685ec9735e30d6a4d19de0efed7
URL: http://oprofile.sourceforge.net/
# not used directly, but build fails without it
BuildRequires: autoconf >= 2.50
BuildRequires: binutils-devel
BuildRequires: libstdc++-devel
BuildRequires: linux-libc-headers >= 7:2.6.31
+BuildRequires: pkgconfig
BuildRequires: popt-devel
BuildRequires: rpmbuild(macros) >= 1.217
Requires: uname(release) >= 2.6.31
Conflicts: kernel < 2.6.31
-ExclusiveArch: alpha arm %{ix86} ia64 mips ppc ppc64 %{x8664} x32
+ExclusiveArch: alpha %{arm} %{ix86} ia64 mips ppc ppc64 %{x8664} x32
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define oprofile_arch %(echo "%{_target_base_arch}" | sed -e
's#x86_64#x86-64#')
@@ -83,8 +83,6 @@ Statyczna biblioteka libopagent.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
%configure
@@ -111,9 +109,9 @@ fi
%defattr(644,root,root,755)
%doc ChangeLog* README TODO doc/*.html doc/*.png doc/*.xsd
%attr(755,root,root) %{_bindir}/ocount
+%attr(755,root,root) %{_bindir}/op-check-perfevents
%attr(755,root,root) %{_bindir}/opannotate
%attr(755,root,root) %{_bindir}/oparchive
-%attr(755,root,root) %{_bindir}/op-check-perfevents
%attr(755,root,root) %{_bindir}/operf
%attr(755,root,root) %{_bindir}/opgprof
%attr(755,root,root) %{_bindir}/ophelp
@@ -125,14 +123,15 @@ fi
%attr(755,root,root) %{_libdir}/oprofile/libopagent.so.1
%{_datadir}/%{name}
%dir %{_var}/lib/oprofile
+%{_mandir}/man1/op-check-perfevents.1*
%{_mandir}/man1/ocount.1*
%{_mandir}/man1/opannotate.1*
%{_mandir}/man1/oparchive.1*
-%{_mandir}/man1/op-check-perfevents.1*
%{_mandir}/man1/operf.1*
%{_mandir}/man1/opgprof.1*
%{_mandir}/man1/ophelp.1*
%{_mandir}/man1/opimport.1*
+%{_mandir}/man1/opjitconv.1*
%{_mandir}/man1/opreport.1*
%{_mandir}/man1/oprofile.1*
diff --git a/binutils-2.34.patch b/binutils-2.34.patch
deleted file mode 100644
index a842faf..0000000
--- a/binutils-2.34.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- oprofile-1.1.0/libutil++/bfd_support.cpp.orig 2015-07-07
16:04:37.000000000 +0200
-+++ oprofile-1.1.0/libutil++/bfd_support.cpp 2020-03-23 23:04:37.666971686
+0100
-@@ -137,7 +137,7 @@
- }
- }
-
-- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect);
-+ bfd_size_type buildid_sect_size = bfd_section_size(sect);
- char * contents = (char *) xmalloc(buildid_sect_size);
- errno = 0;
- if (!bfd_get_section_contents(ibfd, sect,
-@@ -188,7 +188,7 @@
- if (sect == NULL)
- return false;
-
-- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect);
-+ bfd_size_type debuglink_size = bfd_section_size(sect);
- char * contents = (char *) xmalloc(debuglink_size);
- cverb << vbfd
- << ".gnu_debuglink section has size " << debuglink_size << endl;
-@@ -346,7 +346,7 @@
- // first restrict the search on a sensible range of vma, 16 is
- // an intuitive value based on epilog code look
- size_t max_search = 16;
-- size_t section_size = bfd_section_size(abfd, section);
-+ size_t section_size = bfd_section_size(section);
- if (pc + max_search > section_size)
- max_search = section_size - pc;
-
-@@ -819,10 +819,10 @@
- else
- pc = (sym.value() + offset) - sym.filepos();
-
-- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
-+ if ((bfd_section_flags(section) & SEC_ALLOC) == 0)
- goto fail;
-
-- if (pc >= bfd_section_size(abfd, section))
-+ if (pc >= bfd_section_size(section))
- goto fail;
-
- ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename,
---- oprofile-1.1.0/opjitconv/create_bfd.c.orig 2020-03-23 23:06:05.216972844
+0100
-+++ oprofile-1.1.0/opjitconv/create_bfd.c 2020-03-23 23:07:01.340306932
+0100
-@@ -86,12 +86,12 @@
- bfd_perror("bfd_make_section");
- goto error;
- }
-- bfd_set_section_vma(abfd, section, vma);
-- if (bfd_set_section_size(abfd, section, size) == FALSE) {
-+ bfd_set_section_vma(section, vma);
-+ if (bfd_set_section_size(section, size) == FALSE) {
- bfd_perror("bfd_set_section_size");
- goto error;
- }
-- if (bfd_set_section_flags(abfd, section, flags) == FALSE) {
-+ if (bfd_set_section_flags(section, flags) == FALSE) {
- bfd_perror("bfd_set_section_flags");
- goto error;
- }
diff --git a/oprofile-c++.patch b/oprofile-c++.patch
deleted file mode 100644
index d485064..0000000
--- a/oprofile-c++.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- oprofile-1.1.0/libutil++/op_bfd.cpp.orig 2015-06-05 22:39:34.000000000
+0200
-+++ oprofile-1.1.0/libutil++/op_bfd.cpp 2017-06-06 20:17:42.480491005
+0200
-@@ -535,7 +535,7 @@
- {
- op_bfd_symbol const & sym = syms[sym_idx];
-
-- bool const verbose = cverb << (vbfd & vlevel1);
-+ bool const verbose = bool(cverb << (vbfd & vlevel1));
-
- if (anon_obj)
- start = sym.vma();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/oprofile.git/commitdiff/46fcb93cef90c4052671e55c5ea5059224ec7b09
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
