* [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/
@ 2016-03-19 5:41 Andrew Savchenko
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Savchenko @ 2016-03-19 5:41 UTC (permalink / raw
To: gentoo-commits
commit: 331e1e47a803fcc79d9e66ae54db9c364a8f1af9
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 04:59:03 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 05:00:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=331e1e47
dev-util/oprofile: remove old version
Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
dev-util/oprofile/Manifest | 1 -
.../oprofile/files/oprofile-1.0.0-athlon.patch | 20 ------
.../files/oprofile-1.0.0-opjitconv-open.patch | 11 ----
dev-util/oprofile/oprofile-1.0.0-r2.ebuild | 72 ----------------------
4 files changed, 104 deletions(-)
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 0dd98d4..e5c9b78 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.0.0.tar.gz 1397396 SHA256 847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a SHA512 35b0e9f23c1d8df0aebda3f9b550692a896424de901d529a0ad41da41000328f33d184dcbb8e6f8367008723c8b2177b621757a2282b4c881ac46a57e1b51010 WHIRLPOOL eaf7feefb6561851d2f8573ec60f2086245aa9fc034c8f4ab62679895ae80ca45e8dcb4bfdcb96ad477c5b446b7f0b11e339d9dc270e8b4b0366bc3a9e980143
DIST oprofile-1.1.0.tar.gz 1468502 SHA256 cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758 WHIRLPOOL b268af1578c485165624e0152751b6c5053c745e6813d6f13ea554993f311e540312854a36011e10560e82c378ef1fc357220a69cd713f73824ae249cc150650
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 5916271..0000000
--- 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/files/oprofile-1.0.0-opjitconv-open.patch b/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch
deleted file mode 100644
index 2943a07..0000000
--- a/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/opjitconv/opjitconv.c
-+++ b/opjitconv/opjitconv.c
-@@ -216,7 +216,7 @@
- int file_locked = 0;
- unsigned int usecs_waited = 0;
- int rc = OP_JIT_CONV_OK;
-- int fd = open(dumpfile, S_IRUSR);
-+ int fd = open(dumpfile, O_RDONLY);
- if (fd < 0) {
- perror("opjitconv failed to open JIT dumpfile");
- return OP_JIT_CONV_FAIL;
diff --git a/dev-util/oprofile/oprofile-1.0.0-r2.ebuild b/dev-util/oprofile/oprofile-1.0.0-r2.ebuild
deleted file mode 100644
index 2fda6ad..0000000
--- a/dev-util/oprofile/oprofile-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils java-pkg-opt-2 linux-info multilib user
-
-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"
-
-RDEPEND=">=dev-libs/popt-1.7-r1
- sys-libs/binutils-libs
- >=sys-libs/glibc-2.3.2-r1
- java? ( >=virtual/jdk-1.5:= )"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.31"
-
-S="${WORKDIR}/${MY_P}"
-
-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() {
- epatch "${FILESDIR}/${P}-athlon.patch"
- epatch "${FILESDIR}/${P}-opjitconv-open.patch"
-}
-
-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}"
- 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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/
@ 2016-03-20 17:19 Andrew Savchenko
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Savchenko @ 2016-03-20 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 8082ba7028491049b5b6deccede5e80b8c7fdfc1
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 17:14:34 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 17:14:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8082ba70
Revert "dev-util/oprofile: remove old version"
This reverts commit 331e1e47a803fcc79d9e66ae54db9c364a8f1af9, which
accidentally removed patch used by 0.9.9-r2
(oprofile-1.0.0-athlon.patch).
dev-util/oprofile/Manifest | 1 +
.../oprofile/files/oprofile-1.0.0-athlon.patch | 20 ++++++
.../files/oprofile-1.0.0-opjitconv-open.patch | 11 ++++
dev-util/oprofile/oprofile-1.0.0-r2.ebuild | 72 ++++++++++++++++++++++
4 files changed, 104 insertions(+)
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index e5c9b78..0dd98d4 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,2 +1,3 @@
DIST oprofile-0.9.9.tar.gz 1502834 SHA256 1e523400daaba7b8d0d15269e977a08b40edfea53970774b69ae130e25117597 SHA512 98cc3d2c15744d02ed649833cf4797482aec73bd52653e916f80b490e17a8250d988c4c945e52dd8999a0d0603fec405e99c9570dfc54baa4992950fe4d8763f WHIRLPOOL 534d04449923da5008dbf044f9783a1d39ad8b749170edf04a503ca1a885455fc8aef4f5894060d14135f5e3b0a0d577897779eed30dc26deff9b0663fcbb7d1
+DIST oprofile-1.0.0.tar.gz 1397396 SHA256 847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a SHA512 35b0e9f23c1d8df0aebda3f9b550692a896424de901d529a0ad41da41000328f33d184dcbb8e6f8367008723c8b2177b621757a2282b4c881ac46a57e1b51010 WHIRLPOOL eaf7feefb6561851d2f8573ec60f2086245aa9fc034c8f4ab62679895ae80ca45e8dcb4bfdcb96ad477c5b446b7f0b11e339d9dc270e8b4b0366bc3a9e980143
DIST oprofile-1.1.0.tar.gz 1468502 SHA256 cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758 WHIRLPOOL b268af1578c485165624e0152751b6c5053c745e6813d6f13ea554993f311e540312854a36011e10560e82c378ef1fc357220a69cd713f73824ae249cc150650
diff --git a/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch
new file mode 100644
index 0000000..5916271
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch
@@ -0,0 +1,20 @@
+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/files/oprofile-1.0.0-opjitconv-open.patch b/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch
new file mode 100644
index 0000000..2943a07
--- /dev/null
+++ b/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch
@@ -0,0 +1,11 @@
+--- a/opjitconv/opjitconv.c
++++ b/opjitconv/opjitconv.c
+@@ -216,7 +216,7 @@
+ int file_locked = 0;
+ unsigned int usecs_waited = 0;
+ int rc = OP_JIT_CONV_OK;
+- int fd = open(dumpfile, S_IRUSR);
++ int fd = open(dumpfile, O_RDONLY);
+ if (fd < 0) {
+ perror("opjitconv failed to open JIT dumpfile");
+ return OP_JIT_CONV_FAIL;
diff --git a/dev-util/oprofile/oprofile-1.0.0-r2.ebuild b/dev-util/oprofile/oprofile-1.0.0-r2.ebuild
new file mode 100644
index 0000000..2fda6ad
--- /dev/null
+++ b/dev-util/oprofile/oprofile-1.0.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils java-pkg-opt-2 linux-info multilib user
+
+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"
+
+RDEPEND=">=dev-libs/popt-1.7-r1
+ sys-libs/binutils-libs
+ >=sys-libs/glibc-2.3.2-r1
+ java? ( >=virtual/jdk-1.5:= )"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-2.6.31"
+
+S="${WORKDIR}/${MY_P}"
+
+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() {
+ epatch "${FILESDIR}/${P}-athlon.patch"
+ epatch "${FILESDIR}/${P}-opjitconv-open.patch"
+}
+
+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}"
+ 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
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/
@ 2016-03-20 17:19 Andrew Savchenko
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Savchenko @ 2016-03-20 17:19 UTC (permalink / raw
To: gentoo-commits
commit: a5c391c8513b187571c40da5dd84cb1fb2f17c60
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 17:18:08 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 17:18:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c391c8
dev-util/oprofile: remove old unstable version
Package-Manager: portage-2.2.28
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
dev-util/oprofile/Manifest | 1 -
.../files/oprofile-1.0.0-opjitconv-open.patch | 11 ----
dev-util/oprofile/oprofile-1.0.0-r2.ebuild | 72 ----------------------
3 files changed, 84 deletions(-)
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 0dd98d4..e5c9b78 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.0.0.tar.gz 1397396 SHA256 847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a SHA512 35b0e9f23c1d8df0aebda3f9b550692a896424de901d529a0ad41da41000328f33d184dcbb8e6f8367008723c8b2177b621757a2282b4c881ac46a57e1b51010 WHIRLPOOL eaf7feefb6561851d2f8573ec60f2086245aa9fc034c8f4ab62679895ae80ca45e8dcb4bfdcb96ad477c5b446b7f0b11e339d9dc270e8b4b0366bc3a9e980143
DIST oprofile-1.1.0.tar.gz 1468502 SHA256 cf759a6de1a6033d5dfc93bda129a9f2e128aecc4238cc657feb0801d1b0366c SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758 WHIRLPOOL b268af1578c485165624e0152751b6c5053c745e6813d6f13ea554993f311e540312854a36011e10560e82c378ef1fc357220a69cd713f73824ae249cc150650
diff --git a/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch b/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch
deleted file mode 100644
index 2943a07..0000000
--- a/dev-util/oprofile/files/oprofile-1.0.0-opjitconv-open.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/opjitconv/opjitconv.c
-+++ b/opjitconv/opjitconv.c
-@@ -216,7 +216,7 @@
- int file_locked = 0;
- unsigned int usecs_waited = 0;
- int rc = OP_JIT_CONV_OK;
-- int fd = open(dumpfile, S_IRUSR);
-+ int fd = open(dumpfile, O_RDONLY);
- if (fd < 0) {
- perror("opjitconv failed to open JIT dumpfile");
- return OP_JIT_CONV_FAIL;
diff --git a/dev-util/oprofile/oprofile-1.0.0-r2.ebuild b/dev-util/oprofile/oprofile-1.0.0-r2.ebuild
deleted file mode 100644
index 2fda6ad..0000000
--- a/dev-util/oprofile/oprofile-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit eutils java-pkg-opt-2 linux-info multilib user
-
-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"
-
-RDEPEND=">=dev-libs/popt-1.7-r1
- sys-libs/binutils-libs
- >=sys-libs/glibc-2.3.2-r1
- java? ( >=virtual/jdk-1.5:= )"
-DEPEND="${RDEPEND}
- >=sys-kernel/linux-headers-2.6.31"
-
-S="${WORKDIR}/${MY_P}"
-
-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() {
- epatch "${FILESDIR}/${P}-athlon.patch"
- epatch "${FILESDIR}/${P}-opjitconv-open.patch"
-}
-
-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}"
- 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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/
@ 2017-11-23 16:35 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2017-11-23 16:35 UTC (permalink / raw
To: gentoo-commits
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 <aaro.koskinen@iki.fi>
-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 <aaro.koskinen@iki.fi>
-
-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 <wcohen@redhat.com>
-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 <wcohen@redhat.com>
-
-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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/
@ 2018-12-22 6:54 Andrew Savchenko
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Savchenko @ 2018-12-22 6:54 UTC (permalink / raw
To: gentoo-commits
commit: f4a8f285371d3b64355e50bfc2a4754fbfbbe2ec
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 22 06:53:17 2018 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Dec 22 06:54:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a8f285
dev-util/oprofile: remove old
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11
dev-util/oprofile/Manifest | 1 -
.../files/oprofile-1.1.0-gcc6-template-depth.patch | 10 ---
dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch | 30 ---------
dev-util/oprofile/oprofile-1.1.0-r1.ebuild | 75 ----------------------
4 files changed, 116 deletions(-)
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 9485fee3e1b..6e3bf9e62e3 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,3 +1,2 @@
-DIST oprofile-1.1.0.tar.gz 1468502 BLAKE2B 5c0abdf1ce6f3fa9b7140036ff654b2f5d5e29d996afec834014c141a4669e57c1d4ac60d6705c35ee1dce23ce790e07063b58508abd39b6562b7298744e2eb4 SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758
DIST oprofile-1.2.0.tar.gz 1533343 BLAKE2B 873433ddba11389a221ff3b6eb6b8b19748ac4989232bda7d9af698b95dedf8ecd1112dce3accab5e1b40c87287901c015eec167713b9ad11daa0a0f0e3255f9 SHA512 d642d9a8d71ad271a80d21806ffd8522613830f450a71dc531005e940f31f683936691898d381a31f8913715361db8c1713dfe3744a5f9214419349f6504717d
DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch
deleted file mode 100644
index 01fc86910a3..00000000000
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- oprofile-1.1.0/configure.ac.orig 2015-07-21 17:53:27.000000000 +0300
-+++ oprofile-1.1.0/configure.ac 2016-11-22 01:15:31.329067697 +0300
-@@ -320,7 +320,6 @@
- AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-Wall])
- AX_CFLAGS_OPTION(OP_CFLAGS,[-fno-common])
- AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-fno-common])
--AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-ftemplate-depth-50])
- AX_CFLAGS_OPTION(OP_CFLAGS,[-Wdeclaration-after-statement])
-
- dnl enable option to use GCC test coverage
diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
deleted file mode 100644
index ab3ca7c1b14..00000000000
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/libop/op_alloc_counter.c
-+++ b/libop/op_alloc_counter.c
-@@ -171,7 +171,7 @@
- /* no counters then probably perfmon managing perfmon hw */
- if (nr_counters <= 0) {
- nr_counters = op_get_nr_counters(cpu_type);
-- unavailable_counters = (~0) << nr_counters;
-+ unavailable_counters = (~0U) << nr_counters;
- }
-
- /* Check to see if we have enough physical counters to map events*/
---- a/libutil++/op_bfd.cpp
-+++ b/libutil++/op_bfd.cpp
-@@ -535,15 +535,13 @@
- {
- 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));
diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
deleted file mode 100644
index 2c8a16f7a16..00000000000
--- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils java-pkg-opt-2 linux-info multilib user
-
-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"
-
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-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() {
- # fix bug #594178
- epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
- # bug #600000
- epatch "${FILESDIR}/${PN}-1.1.0-gcc6-template-depth.patch"
- 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}"
- 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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/
@ 2020-06-27 18:23 Andrew Savchenko
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Savchenko @ 2020-06-27 18:23 UTC (permalink / raw
To: gentoo-commits
commit: c852a7c84f28fe745437bcddc4d88b9dc44c85f5
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 27 18:19:05 2020 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 18:22:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c852a7c8
dev-util/oprofile: fix build with binutils-2.34
Use upstream patch 377610414fb6cd7ac30e4485d9d6482fcf29aca6 to fix
build with new binutils api (2.34) while keeping compatibility
support with older versions.
Closes: https://bugs.gentoo.org/707850
Closes: https://github.com/gentoo/gentoo/pull/15469
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
dev-util/oprofile/files/binutils-2.34.patch | 157 ++++++++++++++++++++++++++++
dev-util/oprofile/oprofile-1.3.0.ebuild | 8 +-
2 files changed, 164 insertions(+), 1 deletion(-)
diff --git a/dev-util/oprofile/files/binutils-2.34.patch b/dev-util/oprofile/files/binutils-2.34.patch
new file mode 100644
index 00000000000..6337191a21d
--- /dev/null
+++ b/dev-util/oprofile/files/binutils-2.34.patch
@@ -0,0 +1,157 @@
+commit 377610414fb6cd7ac30e4485d9d6482fcf29aca6
+Author: William Cohen <wcohen@redhat.com>
+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
index 826af1f43b9..da8d69f7b57 100644
--- a/dev-util/oprofile/oprofile-1.3.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.3.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit java-pkg-opt-2 linux-info user
+inherit autotools java-pkg-opt-2 linux-info user
DESCRIPTION="A transparent low-overhead system-wide profiler"
HOMEPAGE="http://oprofile.sourceforge.net"
@@ -39,6 +39,12 @@ pkg_setup() {
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 \
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/
@ 2021-07-23 19:57 Conrad Kostecki
0 siblings, 0 replies; 7+ messages in thread
From: Conrad Kostecki @ 2021-07-23 19:57 UTC (permalink / raw
To: gentoo-commits
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 <wcohen@redhat.com>
-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
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-07-23 19:57 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-23 16:35 [gentoo-commits] repo/gentoo:master commit in: dev-util/oprofile/, dev-util/oprofile/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-07-23 19:57 Conrad Kostecki
2020-06-27 18:23 Andrew Savchenko
2018-12-22 6:54 Andrew Savchenko
2016-03-20 17:19 Andrew Savchenko
2016-03-20 17:19 Andrew Savchenko
2016-03-19 5:41 Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox