commit: bc2df13412d0ca85486b83f439e8c42a4992bb06 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Nov 22 18:20:24 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Nov 23 16:34:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc2df134
dev-util/oprofile: Drop old Package-Manager: Portage-2.3.16, Repoman-2.3.6 dev-util/oprofile/Manifest | 1 - .../files/oprofile-0.9.9-gcc-4.9-non-ppc.patch | 36 ---------- .../files/oprofile-0.9.9-gcc-4.9-unused.patch | 47 ------------- .../oprofile/files/oprofile-1.0.0-athlon.patch | 20 ------ dev-util/oprofile/oprofile-0.9.9-r2.ebuild | 82 ---------------------- 5 files changed, 186 deletions(-) diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest index f91abaa9c0c..91169c0dbce 100644 --- a/dev-util/oprofile/Manifest +++ b/dev-util/oprofile/Manifest @@ -1,3 +1,2 @@ -DIST oprofile-0.9.9.tar.gz 1502834 SHA256 1e523400daaba7b8d0d15269e977a08b40edfea53970774b69ae130e25117597 SHA512 98cc3d2c15744d02ed649833cf4797482aec73bd52653e916f80b490e17a8250d988c4c945e52dd8999a0d0603fec405e99c9570dfc54baa4992950fe4d8763f WHIRLPOOL 534d04449923da5008dbf044f9783a1d39ad8b749170edf04a503ca1a885455fc8aef4f5894060d14135f5e3b0a0d577897779eed30dc26deff9b0663fcbb7d1 DIST oprofile-1.1.0.tar.gz 1468502 SHA256 cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758 WHIRLPOOL b268af1578c485165624e0152751b6c5053c745e6813d6f13ea554993f311e540312854a36011e10560e82c378ef1fc357220a69cd713f73824ae249cc150650 DIST oprofile-1.2.0.tar.gz 1533343 SHA256 eb95f98c40b7d0ee29b45fba3565d9f8381747528aa6b6159e37d4fa0c8ca57d SHA512 d642d9a8d71ad271a80d21806ffd8522613830f450a71dc531005e940f31f683936691898d381a31f8913715361db8c1713dfe3744a5f9214419349f6504717d WHIRLPOOL e677d0117ef232bbd8794793e9b9fb31c1d89dc87e5d797d18720ff8baaf0e2f6e8328662a6b1e5b2a5662081e06927923f7969502dea9609ab09ab424a2ae07 diff --git a/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch deleted file mode 100644 index 423c703f7ff..00000000000 --- a/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-non-ppc.patch +++ /dev/null @@ -1,36 +0,0 @@ -Backported from 1.0.0: -====================================================================== -commit 008e470a9b8751de0a3745e511cbc05b68759688 -Author: Aaro Koskinen <[email protected]> -Date: Mon May 12 08:28:46 2014 -0500 - - configure: fix test-for-synth check with GCC 4.9.0 - - With GCC 4.9.0 oprofile 0.9.9 build fails on non-PPC platfroms because - the "test-for-synth" configure check result is incorrect: There is a NULL - pointer dereference in the test program, so the compiler seems to optimize - the rest of the code away, and the test will always succeed regardless - whether powerpc_elf64_vec/bfd_elf64_powerpc_vec are present or not. - Fix by allocating the referred struct statically. - - While at it, also include stdio.h to avoid a compiler warning. - - Signed-off-by: Aaro Koskinen <[email protected]> - -diff --git a/m4/binutils.m4 b/m4/binutils.m4 -index 25fb15a..d7948c1 100644 ---- a/m4/binutils.m4 -+++ b/m4/binutils.m4 -@@ -27,8 +27,10 @@ if test "$OS" = "Linux"; then - AC_MSG_CHECKING([whether bfd_get_synthetic_symtab() exists in BFD library]) - rm -f test-for-synth - AC_LANG_CONFTEST( -- [AC_LANG_PROGRAM([[#include <bfd.h>]], -- [[asymbol * synthsyms; bfd * ibfd = 0; -+ [AC_LANG_PROGRAM([[#include <bfd.h>] -+ [#include <stdio.h>] -+ [static bfd _ibfd;]], -+ [[asymbol * synthsyms; bfd * ibfd = &_ibfd; - long synth_count = bfd_get_synthetic_symtab(ibfd, 0, 0, 0, 0, &synthsyms); - extern const bfd_target bfd_elf64_powerpc_vec; - extern const bfd_target bfd_elf64_powerpcle_vec; diff --git a/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch b/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch deleted file mode 100644 index 5c541a053a7..00000000000 --- a/dev-util/oprofile/files/oprofile-0.9.9-gcc-4.9-unused.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 98f57a6c0e32bc6080a50e1cdd769b9ff78108bc -Author: William Cohen <[email protected]> -Date: Tue Jun 10 09:56:55 2014 -0500 - - Remove unused functions causing errors in recent gcc - - The Fedora rawhide compiler is now stricter and will treat the - warnings for unused functions as errors and stop the compile. This patch - removes two unused functions in the code. - - Signed-off-by: William Cohen <[email protected]> - -diff --git a/libpp/callgraph_container.cpp b/libpp/callgraph_container.cpp -index 1d1c95f..c5bc272 100644 ---- a/libpp/callgraph_container.cpp -+++ b/libpp/callgraph_container.cpp -@@ -36,13 +36,6 @@ using namespace std; - - namespace { - --bool operator==(cg_symbol const & lhs, cg_symbol const & rhs) --{ -- less_symbol cmp_symb; -- return !cmp_symb(lhs, rhs) && !cmp_symb(rhs, lhs); --} -- -- - // we store {caller,callee} inside a single u64 - odb_key_t caller_to_key(u32 value) - { -diff --git a/libpp/xml_utils.cpp b/libpp/xml_utils.cpp -index 5f1a3a1..3de41e5 100644 ---- a/libpp/xml_utils.cpp -+++ b/libpp/xml_utils.cpp -@@ -101,12 +101,6 @@ bool has_separated_thread_info() - } - - --string get_cpu_num(size_t pclass) --{ -- return classes.v[pclass].ptemplate.cpu; --} -- -- - }; // anonymous namespace - - xml_utils::xml_utils(format_output::xml_formatter * xo, diff --git a/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch deleted file mode 100644 index 5916271b3a0..00000000000 --- a/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix AMD Athlon CPU family recognition. -See upstream bug 275 for details: -https://sourceforge.net/p/oprofile/bugs/275/ ---- oprofile-1.0.0/libop/op_cpu_type.c.orig 2014-09-12 18:39:47.000000000 +0400 -+++ oprofile-1.0.0/libop/op_cpu_type.c 2014-11-30 18:29:00.328342552 +0300 -@@ -538,10 +538,13 @@ - family = cpu_family(eax); - - /* These family does not exist in the past.*/ -- if (family < 0x0f || family == 0x13) -+ if ((family < 0x0f && family != 0x06) || family == 0x13) - return ret; - - switch (family) { -+ case 0x6: -+ ret = op_get_cpu_number("i386/athlon"); -+ break; - case 0x0f: - ret = op_get_cpu_number("x86-64/hammer"); - break; diff --git a/dev-util/oprofile/oprofile-0.9.9-r2.ebuild b/dev-util/oprofile/oprofile-0.9.9-r2.ebuild deleted file mode 100644 index a5a0ac05f12..00000000000 --- a/dev-util/oprofile/oprofile-0.9.9-r2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit autotools eutils linux-info multilib user java-pkg-opt-2 - -MY_P=${PN}-${PV/_/-} -DESCRIPTION="A transparent low-overhead system-wide profiler" -HOMEPAGE="http://${PN}.sourceforge.net"; -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86" -IUSE="java pch qt4" - -DEPEND=">=dev-libs/popt-1.7-r1 - sys-libs/binutils-libs:= - >=sys-libs/glibc-2.3.2-r1 - ppc64? ( dev-libs/libpfm ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - java? ( >=virtual/jdk-1.5:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - linux-info_pkg_setup - if ! linux_config_exists || ! linux_chkconfig_present OPROFILE ; then - echo - elog "In order for ${PN} to work, you need to configure your kernel" - elog "with CONFIG_OPROFILE set to 'm' or 'y'." - echo - fi - - if ! kernel_is -ge 2 6 ; then - echo - elog "Support for kernels before 2.6 has been dropped in ${PN}-0.9.8." - echo - fi - - # Required for JIT support, see README_PACKAGERS - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} - - use java && java-pkg_init -} - -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 -} - -src_configure() { - econf \ - --disable-werror \ - $(use_with qt4 x) \ - $(use_enable qt4 gui qt4) \ - $(use_enable pch) \ - $(use_with java java ${JAVA_HOME}) -} - -src_install() { - emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install - - dodoc ChangeLog* README TODO - - dodir /etc/env.d - echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${D}"/etc/env.d/10${PN} || die "env.d failed" -} - -pkg_postinst() { - echo - elog "Now load the ${PN} module by running:" - elog " # opcontrol --init" - elog "Then read manpages and this html doc:" - elog " /usr/share/doc/${PF}/${PN}.html" - echo -}
