Compare commits
6 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| f33615568f | |||
|
|
59e0bff13b | ||
|
|
c2af903f3c | ||
| 39f12f95a6 | |||
|
|
fdcac240a7 | ||
|
|
ecb47d301e |
41
0001-CMake-Make-the-boost-system-component-optional.patch
Normal file
41
0001-CMake-Make-the-boost-system-component-optional.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
From 4a3e3e3b01472260e8ab6ecabe089e3871b0a94b Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Marin <christophe@krop.fr>
|
||||
Date: Mon, 29 Sep 2025 09:36:18 +0200
|
||||
Subject: [PATCH] CMake: Make the boost-system component optional
|
||||
|
||||
The boost-system stub was dropped in boost 1.89. If the minimum version is
|
||||
lower than 1.69, marking the component optional is the recommended way.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/analyze/CMakeLists.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 84cc5fa..2f6d232 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -32,7 +32,7 @@ if (APPIMAGE_BUILD)
|
||||
endif()
|
||||
|
||||
include(FeatureSummary)
|
||||
-find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS system filesystem iostreams container)
|
||||
+find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS filesystem iostreams container OPTIONAL_COMPONENTS system)
|
||||
set_package_properties(Boost PROPERTIES TYPE RECOMMENDED PURPOSE "Boost container libraries can greatly improve performance (via pmr allocators)")
|
||||
find_package(Threads REQUIRED)
|
||||
find_package(ZLIB REQUIRED)
|
||||
diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt
|
||||
index c3cc788..95d5e01 100644
|
||||
--- a/src/analyze/CMakeLists.txt
|
||||
+++ b/src/analyze/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@ if (ECM_FOUND)
|
||||
include(ECMEnableSanitizers)
|
||||
endif()
|
||||
|
||||
-find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options system filesystem)
|
||||
+find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options filesystem OPTIONAL_COMPONENTS system)
|
||||
|
||||
configure_file(analyze_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/analyze_config.h)
|
||||
|
||||
--
|
||||
2.51.0
|
||||
|
||||
@@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 15 08:38:11 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Use -std=gnu++17 to compile heaptrack after the robin-map update to 1.4.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 29 09:45:09 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Add patch:
|
||||
* 0001-CMake-Make-the-boost-system-component-optional.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 1 12:40:50 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package heaptrack
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -34,12 +34,13 @@ Source2: heaptrack.keyring
|
||||
Patch0: 0001-cmake-Fix-C-compatibility-of-libunwind-probes.patch
|
||||
# PATCH-FIX-UPSTREAM -- CMake 4 compat
|
||||
Patch1: 0001-Use-system-robin-map.patch
|
||||
# PATCH-FIX-UPSTREAM -- boost 1.89 compat
|
||||
Patch2: 0001-CMake-Make-the-boost-system-component-optional.patch
|
||||
BuildRequires: extra-cmake-modules
|
||||
BuildRequires: libboost_container-devel
|
||||
BuildRequires: libboost_filesystem-devel
|
||||
BuildRequires: libboost_iostreams-devel
|
||||
BuildRequires: libboost_program_options-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
BuildRequires: libdwarf-devel
|
||||
BuildRequires: libunwind-devel
|
||||
BuildRequires: pkgconfig
|
||||
@@ -85,6 +86,9 @@ A Qt5/KF5 based GUI for Heaptrack.
|
||||
# Disable building tests, they're not used and post-build-checks trips over it
|
||||
sed -i"" '/add_subdirectory(tests)/d' CMakeLists.txt
|
||||
|
||||
# Needed after robin-map update to 1.4.0
|
||||
sed -i 's#CMAKE_CXX_STANDARD 14#CMAKE_CXX_STANDARD 17#' CMakeLists.txt
|
||||
|
||||
%build
|
||||
%if "%{_lib}" == "lib64"
|
||||
extra_opts="-DLIB_SUFFIX=64"
|
||||
|
||||
Reference in New Issue
Block a user