commit: 3b093bade8119e4a9677369a31ae8b8c55b18fa6 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Oct 18 09:27:43 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Oct 18 09:36:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b093bad
dev-util/heaptrack: Unbundle dev-cpp/robin-map Closes: https://bugs.gentoo.org/964521 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...ack-1.5.80_pre20251017-unbundle-robin-map.patch | 61 ++++++++++++++++++++++ .../heaptrack/heaptrack-1.5.80_pre20251017.ebuild | 7 ++- dev-util/heaptrack/heaptrack-9999.ebuild | 7 ++- 3 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dev-util/heaptrack/files/heaptrack-1.5.80_pre20251017-unbundle-robin-map.patch b/dev-util/heaptrack/files/heaptrack-1.5.80_pre20251017-unbundle-robin-map.patch new file mode 100644 index 000000000000..133131e51d02 --- /dev/null +++ b/dev-util/heaptrack/files/heaptrack-1.5.80_pre20251017-unbundle-robin-map.patch @@ -0,0 +1,61 @@ +Source: https://invent.kde.org/sdk/heaptrack/-/merge_requests/52 + +From f799dc69049c69575ea605c58703ea4b133b26b6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Fri, 17 Oct 2025 22:16:38 +0200 +Subject: [PATCH] Allow to use system robin-map instead of bundled + +Adds new HEAPTRACK_USE_SYSTEM_ROBINMAP CMake option + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + 3rdparty/CMakeLists.txt | 7 ++++--- + CMakeLists.txt | 10 ++++++++++ + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt +index a2c8e69b..297e227a 100644 +--- a/3rdparty/CMakeLists.txt ++++ b/3rdparty/CMakeLists.txt +@@ -18,6 +18,7 @@ if (ZSTD_FOUND AND NOT BOOST_IOSTREAMS_HAS_ZSTD) + mark_as_system_target(boost-zstd) + endif() + +-add_subdirectory(robin-map) +- +-mark_as_system_target(robin_map) ++if(NOT HEAPTRACK_USE_SYSTEM_ROBINMAP) ++ add_subdirectory(robin-map) ++ mark_as_system_target(robin_map) ++endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index adc08a32..90fd6c07 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -99,6 +99,12 @@ option( + ON + ) + ++option( ++ HEAPTRACK_USE_SYSTEM_ROBINMAP ++ "Use system robin-map instead of bundled" ++ OFF ++) ++ + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + + if (NOT MSVC) +@@ -158,6 +164,10 @@ if (HEAPTRACK_BUILD_TRACK) + endif() + endif() + ++if (HEAPTRACK_USE_SYSTEM_ROBINMAP) ++ find_package(tsl-robin-map CONFIG REQUIRED) ++endif() ++ + add_subdirectory(3rdparty) + add_subdirectory(src) + add_subdirectory(tests) +-- +GitLab + diff --git a/dev-util/heaptrack/heaptrack-1.5.80_pre20251017.ebuild b/dev-util/heaptrack/heaptrack-1.5.80_pre20251017.ebuild index cb380861f937..6e45568a05a1 100644 --- a/dev-util/heaptrack/heaptrack-1.5.80_pre20251017.ebuild +++ b/dev-util/heaptrack/heaptrack-1.5.80_pre20251017.ebuild @@ -17,8 +17,8 @@ IUSE="+gui test zstd" RESTRICT="!test? ( test )" -# TODO: unbundle robin-map DEPEND=" + dev-cpp/robin-map dev-libs/boost:=[zstd?,zlib] sys-libs/libunwind:= sys-libs/zlib @@ -41,18 +41,21 @@ RDEPEND="${DEPEND} " BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )" +PATCHES=( "${FILESDIR}/${P}-unbundle-robin-map.patch" ) # bug #964521 + QA_CONFIG_IMPL_DECL_SKIP=( # This doesn't exist in libunwind (bug #898768). unw_backtrace_skip ) src_prepare() { + rm -r 3rdparty/{boost-zstd,robin-map} || die # ensure no bundling cmake_src_prepare - rm -rf 3rdparty/boost-zstd || die # ensure no bundling } src_configure() { local mycmakeargs=( + -DHEAPTRACK_USE_SYSTEM_ROBINMAP=ON -DHEAPTRACK_BUILD_GUI=$(usex gui) -DBUILD_TESTING=$(usex test) $(cmake_use_find_package zstd ZSTD) diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild index b15ea36d2793..5081b9bb1e01 100644 --- a/dev-util/heaptrack/heaptrack-9999.ebuild +++ b/dev-util/heaptrack/heaptrack-9999.ebuild @@ -16,8 +16,8 @@ IUSE="+gui test zstd" RESTRICT="!test? ( test )" -# TODO: unbundle robin-map DEPEND=" + dev-cpp/robin-map dev-libs/boost:=[zstd?,zlib] sys-libs/libunwind:= sys-libs/zlib @@ -40,18 +40,21 @@ RDEPEND="${DEPEND} " BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )" +PATCHES=( "${FILESDIR}/${PN}-1.5.80_pre20251017-unbundle-robin-map.patch" ) # bug #964521 + QA_CONFIG_IMPL_DECL_SKIP=( # This doesn't exist in libunwind (bug #898768). unw_backtrace_skip ) src_prepare() { + rm -r 3rdparty/{boost-zstd,robin-map} || die # ensure no bundling cmake_src_prepare - rm -rf 3rdparty/boost-zstd || die # ensure no bundling } src_configure() { local mycmakeargs=( + -DHEAPTRACK_USE_SYSTEM_ROBINMAP=ON -DHEAPTRACK_BUILD_GUI=$(usex gui) -DBUILD_TESTING=$(usex test) $(cmake_use_find_package zstd ZSTD)
