commit:     72d4903b60bbe0662d97011595e4a7fd73003e93
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Wed Oct 15 10:27:53 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 15 14:27:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d4903b

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

Also remove system absl patch from -9999 as it will automatically
use system libs.

Closes: https://bugs.gentoo.org/964344
Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Part-of: https://github.com/gentoo/gentoo/pull/44188
Closes: https://github.com/gentoo/gentoo/pull/44188
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/bloaty/{bloaty-9999.ebuild => bloaty-1.1-r2.ebuild} | 5 ++++-
 dev-util/bloaty/bloaty-9999.ebuild                           | 9 ++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-util/bloaty/bloaty-9999.ebuild 
b/dev-util/bloaty/bloaty-1.1-r2.ebuild
similarity index 89%
copy from dev-util/bloaty/bloaty-9999.ebuild
copy to dev-util/bloaty/bloaty-1.1-r2.ebuild
index ea1ae5795ac4..1f32cf382373 100644
--- a/dev-util/bloaty/bloaty-9999.ebuild
+++ b/dev-util/bloaty/bloaty-1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="A size profiler for binaries"
 HOMEPAGE="https://github.com/google/bloaty";
@@ -49,5 +49,8 @@ src_configure() {
                )
        fi
 
+       # capstone-6 compatibility (#964344)
+       append-flags -DCAPSTONE_AARCH64_COMPAT_HEADER
+
        cmake_src_configure
 }

diff --git a/dev-util/bloaty/bloaty-9999.ebuild 
b/dev-util/bloaty/bloaty-9999.ebuild
index ea1ae5795ac4..996d242518b8 100644
--- a/dev-util/bloaty/bloaty-9999.ebuild
+++ b/dev-util/bloaty/bloaty-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 DESCRIPTION="A size profiler for binaries"
 HOMEPAGE="https://github.com/google/bloaty";
@@ -32,10 +32,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.1-system-abseil.patch
-)
-
 src_configure() {
        local mycmakeargs=(
                -DBLOATY_ENABLE_CMAKETARGETS=OFF
@@ -49,5 +45,8 @@ src_configure() {
                )
        fi
 
+       # capstone-6 compatibility (#964344)
+       append-flags -DCAPSTONE_AARCH64_COMPAT_HEADER
+
        cmake_src_configure
 }

Reply via email to