commit: 59c0f9ecb04c02862f31e4b66bec279b4964bb23 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Sun Feb 22 13:23:27 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 22 13:32:47 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59c0f9ec
dev-debug/hotspot: fix automagic debuginfod detection Instead of trying to prevent the linking and failing with missing symbols, prevent detection of debuginfod via the resulting variables of check_symbol_exists. Closes: https://bugs.gentoo.org/970440 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> ...07.ebuild => hotspot-1.5.1_p20250907-r1.ebuild} | 23 ++++++++-------------- dev-debug/hotspot/hotspot-9999.ebuild | 23 ++++++++-------------- 2 files changed, 16 insertions(+), 30 deletions(-) diff --git a/dev-debug/hotspot/hotspot-1.5.1_p20250907.ebuild b/dev-debug/hotspot/hotspot-1.5.1_p20250907-r1.ebuild similarity index 88% rename from dev-debug/hotspot/hotspot-1.5.1_p20250907.ebuild rename to dev-debug/hotspot/hotspot-1.5.1_p20250907-r1.ebuild index 71467c563d7e..c1b79057e940 100644 --- a/dev-debug/hotspot/hotspot-1.5.1_p20250907.ebuild +++ b/dev-debug/hotspot/hotspot-1.5.1_p20250907-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -91,25 +91,18 @@ src_unpack() { fi } -src_prepare() { - if ! use debuginfod ; then - sed -i \ - '/target_link_libraries(libhotspot-perfparser PRIVATE ${LIBDEBUGINFOD_LIBRARIES})/d' \ - 3rdparty/perfparser.cmake || die "sed failed for perfparser" - - sed -i \ - '/target_compile_definitions(libhotspot-perfparser PRIVATE HAVE_DWFL_GET_DEBUGINFOD_CLIENT=1)/d' \ - 3rdparty/perfparser.cmake || die "sed failed for perfparser" - fi - - ecm_src_prepare -} - src_configure() { local mycmakeargs=( -DQT6_BUILD=true ) + if ! use debuginfod; then + mycmakeargs+=( + -DHAVE_DWFL_GET_DEBUGINFOD_CLIENT_SYMBOL="no" + -DHAVE_DEBUGINFOD_SET_USER_DATA="no" + ) + fi + ecm_src_configure } diff --git a/dev-debug/hotspot/hotspot-9999.ebuild b/dev-debug/hotspot/hotspot-9999.ebuild index 71467c563d7e..c1b79057e940 100644 --- a/dev-debug/hotspot/hotspot-9999.ebuild +++ b/dev-debug/hotspot/hotspot-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -91,25 +91,18 @@ src_unpack() { fi } -src_prepare() { - if ! use debuginfod ; then - sed -i \ - '/target_link_libraries(libhotspot-perfparser PRIVATE ${LIBDEBUGINFOD_LIBRARIES})/d' \ - 3rdparty/perfparser.cmake || die "sed failed for perfparser" - - sed -i \ - '/target_compile_definitions(libhotspot-perfparser PRIVATE HAVE_DWFL_GET_DEBUGINFOD_CLIENT=1)/d' \ - 3rdparty/perfparser.cmake || die "sed failed for perfparser" - fi - - ecm_src_prepare -} - src_configure() { local mycmakeargs=( -DQT6_BUILD=true ) + if ! use debuginfod; then + mycmakeargs+=( + -DHAVE_DWFL_GET_DEBUGINFOD_CLIENT_SYMBOL="no" + -DHAVE_DEBUGINFOD_SET_USER_DATA="no" + ) + fi + ecm_src_configure }
