commit: fc02b0e9445e607a9665cf646b87ae75cdc83208 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Fri Jul 23 19:55:51 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Jul 23 19:56:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc02b0e9
dev-util/oprofile: drop old version Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-util/oprofile/Manifest | 1 - dev-util/oprofile/files/binutils-2.34.patch | 157 ---------------------------- dev-util/oprofile/oprofile-1.3.0.ebuild | 70 ------------- 3 files changed, 228 deletions(-) diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest index 7fab711d237..af320611042 100644 --- a/dev-util/oprofile/Manifest +++ b/dev-util/oprofile/Manifest @@ -1,2 +1 @@ -DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba DIST oprofile-1.4.0.tar.gz 1557625 BLAKE2B fe1a725b713da0e06d3876c52f001163965c1b0dd8ccbb271ef6924525ac6ca342d55172c06cc21681b441c744780d5cb523be08562952c5916005ec67734221 SHA512 44c0ae55d20d623ea8b4245bfe3e208813dbb8778d7e320378ffe70538ef6af1a6ddaf5d110e29751c216879543f13121dd71cb320023205622b3f0cd6b157df diff --git a/dev-util/oprofile/files/binutils-2.34.patch b/dev-util/oprofile/files/binutils-2.34.patch deleted file mode 100644 index 6337191a21d..00000000000 --- a/dev-util/oprofile/files/binutils-2.34.patch +++ /dev/null @@ -1,157 +0,0 @@ -commit 377610414fb6cd7ac30e4485d9d6482fcf29aca6 -Author: William Cohen <[email protected]> -Date: Wed Mar 18 21:19:16 2020 -0400 - - Macro wrappers to handle the binutils 2.34 api changes - - Changes in binutils 2.34 API prevented oprofile from compiling with - it. This patch tests for the changes in the binutils API during - configuration and selects the appropiate wrappers to allow oprofile to - compile. This allows oprofile to compile with both older and newer - versions of binutils. - -diff --git a/configure.ac b/configure.ac -index ac2fd35e..df032a78 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -224,6 +224,26 @@ if test "$host_cpu" = "powerpc64le" -o "$host_cpu" = "powerpc64"; then - fi - AC_SUBST(PFM_LIB) - -+HAVE_BINUTILS_234='1' -+AC_MSG_CHECKING([whether binutils 2.34 is being used]) -+rm -f test-for-BINUTILS -+AC_LANG_CONFTEST( -+ [AC_LANG_PROGRAM([[#include <bfd.h>]], -+ [[asection * sect; -+ bfd_size_type buildid_sect_size = bfd_section_size(sect); -+ return 0;]]) -+ ]) -+$CC conftest.$ac_ext $CFLAGS $LDFLAGS $LIBS $PERF_EVENT_FLAGS -o test-for-BINUTILS > /dev/null 2>&1 -+if test -f test-for-BINUTILS; then -+ echo "yes" -+ HAVE_BINUTILS_234='1' -+else -+ echo "no" -+ HAVE_BINUTILS_234='0' -+fi -+AC_DEFINE_UNQUOTED(HAVE_BINUTILS_234, $HAVE_BINUTILS_234, [Using binutils 2.34]) -+rm -f test-for-BINUTILS* -+ - AC_ARG_WITH(java, - [ --with-java=java-home Path to Java home directory (default is "no"; "yes" will use /usr as Java home)], - JAVA_HOMEDIR=$with_java, [with_java=no]) -diff --git a/libutil++/bfd_support.cpp b/libutil++/bfd_support.cpp -index fa904839..cd0f4f71 100644 ---- a/libutil++/bfd_support.cpp -+++ b/libutil++/bfd_support.cpp -@@ -19,6 +19,7 @@ - #include "locate_images.h" - #include "op_libiberty.h" - #include "op_exception.h" -+#include "op_bfd_wrappers.h" - - #include <unistd.h> - #include <errno.h> -@@ -137,7 +138,7 @@ static bool get_build_id(bfd * ibfd, unsigned char * build_id) - } - } - -- bfd_size_type buildid_sect_size = bfd_section_size(ibfd, sect); -+ bfd_size_type buildid_sect_size = op_bfd_section_size(ibfd, sect); - char * contents = (char *) xmalloc(buildid_sect_size); - errno = 0; - if (!bfd_get_section_contents(ibfd, sect, -@@ -188,7 +189,7 @@ bool get_debug_link_info(bfd * ibfd, string & filename, unsigned long & crc32) - if (sect == NULL) - return false; - -- bfd_size_type debuglink_size = bfd_section_size(ibfd, sect); -+ bfd_size_type debuglink_size = op_bfd_section_size(ibfd, sect); - char * contents = (char *) xmalloc(debuglink_size); - cverb << vbfd - << ".gnu_debuglink section has size " << debuglink_size << endl; -@@ -346,7 +347,7 @@ void fixup_linenr(bfd * abfd, asection * section, asymbol ** syms, - // 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 = op_bfd_section_size(abfd, section); - if (pc + max_search > section_size) - max_search = section_size - pc; - -@@ -819,10 +820,10 @@ find_nearest_line(bfd_info const & b, op_bfd_symbol const & sym, - else - pc = (sym.value() + offset) - sym.filepos(); - -- if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) -+ if ((op_bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) - goto fail; - -- if (pc >= bfd_section_size(abfd, section)) -+ if (pc >= op_bfd_section_size(abfd, section)) - goto fail; - - ret = bfd_find_nearest_line(abfd, section, syms, pc, &cfilename, -diff --git a/libutil/op_bfd_wrappers.h b/libutil/op_bfd_wrappers.h -new file mode 100644 -index 00000000..b229cc12 ---- /dev/null -+++ b/libutil/op_bfd_wrappers.h -@@ -0,0 +1,28 @@ -+/** -+ * @file op_bfd_wrappers.h -+ * Wrappers to hide API changes in binutils 2.34 -+ * -+ * @remark Copyright 2020 OProfile authors -+ * @remark Read the file COPYING -+ * -+ * @author William Cohen -+ */ -+ -+#ifndef OP_BFD_WRAPPERS_H -+#define OP_BFD_WRAPPERS_H -+ -+#if HAVE_BINUTILS_234 -+#define op_bfd_section_size(ibfd, sec) bfd_section_size(sec) -+#define op_bfd_get_section_flags(abfd, sec) bfd_section_flags(sec) -+#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(sec, flags) -+#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(sec, vma) -+#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(sec, size) -+#else -+#define op_bfd_section_size(ibfd, sec) bfd_section_size(ibfd, sec) -+#define op_bfd_get_section_flags(abfd, sec) bfd_get_section_flags(abfd, sec) -+#define op_bfd_set_section_flags(abfd, sec, flags) bfd_set_section_flags(abfd, sec, flags) -+#define op_bfd_set_section_vma(abfd, sec, vma) bfd_set_section_vma(abfd, sec, vma) -+#define op_bfd_set_section_size(abfd, sec, size) bfd_set_section_size(abfd, sec, size) -+#endif -+ -+#endif /* !OP_BFD_WRAPPERS_H */ -diff --git a/opjitconv/create_bfd.c b/opjitconv/create_bfd.c -index 48db143b..da1e6d29 100644 ---- a/opjitconv/create_bfd.c -+++ b/opjitconv/create_bfd.c -@@ -16,6 +16,7 @@ - - #include "opjitconv.h" - #include "op_libiberty.h" -+#include "op_bfd_wrappers.h" - - #include <bfd.h> - #include <assert.h> -@@ -86,12 +87,12 @@ asection * create_section(bfd * abfd, char const * section_name, - bfd_perror("bfd_make_section"); - goto error; - } -- bfd_set_section_vma(abfd, section, vma); -- if (bfd_set_section_size(abfd, section, size) == FALSE) { -+ op_bfd_set_section_vma(abfd, section, vma); -+ if (op_bfd_set_section_size(abfd, section, size) == FALSE) { - bfd_perror("bfd_set_section_size"); - goto error; - } -- if (bfd_set_section_flags(abfd, section, flags) == FALSE) { -+ if (op_bfd_set_section_flags(abfd, section, flags) == FALSE) { - bfd_perror("bfd_set_section_flags"); - goto error; - } diff --git a/dev-util/oprofile/oprofile-1.3.0.ebuild b/dev-util/oprofile/oprofile-1.3.0.ebuild deleted file mode 100644 index da8d69f7b57..00000000000 --- a/dev-util/oprofile/oprofile-1.3.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools java-pkg-opt-2 linux-info user - -DESCRIPTION="A transparent low-overhead system-wide profiler" -HOMEPAGE="http://oprofile.sourceforge.net"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86" -IUSE="java pch" - -RDEPEND=">=dev-libs/popt-1.7-r1 - sys-libs/binutils-libs:= - >=sys-libs/glibc-2.3.2-r1 - java? ( >=virtual/jdk-1.5:= ) - ppc64? ( dev-libs/libpfm )" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.31" - -CONFIG_CHECK="PERF_EVENTS" -ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work." - -pkg_setup() { - linux-info_pkg_setup - if ! kernel_is -ge 2 6 31; then - echo - ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0." - echo - fi - - # Required for JIT support, see README_PACKAGERS - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} - - use java && java-pkg_init -} - -src_prepare() { - eapply "${FILESDIR}/binutils-2.34.patch" - java-pkg-opt-2_src_prepare - eautoreconf -} - -src_configure() { - econf \ - --disable-werror \ - $(use_enable pch) \ - $(use_with java java ${JAVA_HOME}) -} - -src_install() { - emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install - - dodoc ChangeLog* README TODO - echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}" || die - doenvd "${T}/10${PN}" -} - -pkg_postinst() { - echo - elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead." - elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels." - elog "Please read manpages and this html doc:" - elog " /usr/share/doc/${PF}/${PN}.html" - echo -}
