commit:     fdd454a230466bb19516923a93cbf96fa1c7dc03
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Wed Oct 15 10:59:00 2025 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Sat Oct 25 19:13:19 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd454a2

dev-util/perf: add compat with >=dev-libs/capstone-6.0

Closes: https://bugs.gentoo.org/964350
Closes: https://github.com/gentoo/gentoo/pull/44189
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 dev-util/perf/perf-6.16-r1.ebuild | 7 +++++--
 dev-util/perf/perf-6.17.ebuild    | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-util/perf/perf-6.16-r1.ebuild 
b/dev-util/perf/perf-6.16-r1.ebuild
index 918a9e75c682..7a897e8a3a78 100644
--- a/dev-util/perf/perf-6.16-r1.ebuild
+++ b/dev-util/perf/perf-6.16-r1.ebuild
@@ -47,8 +47,8 @@ BDEPEND="
        ${PYTHON_DEPS}
        >=app-arch/tar-1.34-r2
        $(python_gen_cond_dep '
-                       dev-python/setuptools[${PYTHON_USEDEP}]
-    ')
+               dev-python/setuptools[${PYTHON_USEDEP}]
+       ')
        app-alternatives/yacc
        app-alternatives/lex
        sys-apps/which
@@ -196,6 +196,9 @@ src_prepare() {
 
        # The code likes to compile local assembly files which lack ELF 
markings.
        find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' 
{} +
+
+       # capstone-6 compatibility (#964350)
+       append-flags -DCAPSTONE_AARCH64_COMPAT_HEADER 
-DCAPSTONE_SYSTEMZ_COMPAT_HEADER
 }
 
 puse() { usex $1 "" 1; }

diff --git a/dev-util/perf/perf-6.17.ebuild b/dev-util/perf/perf-6.17.ebuild
index 7e46ab84e2ab..7a897e8a3a78 100644
--- a/dev-util/perf/perf-6.17.ebuild
+++ b/dev-util/perf/perf-6.17.ebuild
@@ -47,7 +47,7 @@ BDEPEND="
        ${PYTHON_DEPS}
        >=app-arch/tar-1.34-r2
        $(python_gen_cond_dep '
-                       dev-python/setuptools[${PYTHON_USEDEP}]
+               dev-python/setuptools[${PYTHON_USEDEP}]
        ')
        app-alternatives/yacc
        app-alternatives/lex
@@ -196,6 +196,9 @@ src_prepare() {
 
        # The code likes to compile local assembly files which lack ELF 
markings.
        find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' 
{} +
+
+       # capstone-6 compatibility (#964350)
+       append-flags -DCAPSTONE_AARCH64_COMPAT_HEADER 
-DCAPSTONE_SYSTEMZ_COMPAT_HEADER
 }
 
 puse() { usex $1 "" 1; }

Reply via email to