mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-util/heaptrack: fix modern C issue(s)
Closes: https://bugs.gentoo.org/898768 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
43
dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch
Normal file
43
dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch
Normal file
@@ -0,0 +1,43 @@
|
||||
https://invent.kde.org/sdk/heaptrack/-/merge_requests/24
|
||||
|
||||
From ce0e0d218e76b1b724f4e10b9da2d8f33e4156b6 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Fri, 15 Dec 2023 22:53:19 +0100
|
||||
Subject: [PATCH] cmake: Fix C compatibility of libunwind probes
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Future compilers such as GCC 14 are likely to enforce C type
|
||||
compatibility rules by default and report errors like this one:
|
||||
|
||||
…/TryCompile-aAxUZn/src.c: In function ‘main’:
|
||||
…/TryCompile-aAxUZn/src.c:3:43: error: passing argument 1 of ‘unw_backtrace’ from incompatible pointer type
|
||||
3 | int main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; }
|
||||
| ^~~~
|
||||
| |
|
||||
| void * (*)[10]
|
||||
In file included from /usr/include/libunwind-x86_64.h:129,
|
||||
from /usr/include/libunwind.h:23,
|
||||
from …/TryCompile-aAxUZn/src.c:2:
|
||||
/usr/include/libunwind-common.h:318:27: note: expected ‘void **’ but argument is of type ‘void * (*)[10]’
|
||||
318 | extern int unw_backtrace (void **, int);
|
||||
| ^~~~~~~
|
||||
|
||||
Removing the address operator ensures that the array type decays to
|
||||
a pointer, and that the types are compatible.
|
||||
--- a/cmake/FindLibunwind.cmake
|
||||
+++ b/cmake/FindLibunwind.cmake
|
||||
@@ -57,8 +57,8 @@ if (LIBUNWIND_LIBRARY)
|
||||
LIBUNWIND_HAS_UNW_GETCONTEXT)
|
||||
check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { unw_context_t context; unw_cursor_t cursor; unw_getcontext(&context); unw_init_local(&cursor, &context); return 0; }"
|
||||
LIBUNWIND_HAS_UNW_INIT_LOCAL)
|
||||
- check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE)
|
||||
- check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace_skip(&buf, 10, 2); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE_SKIP)
|
||||
+ check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace(buf, 10); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE)
|
||||
+ check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace_skip(buf, 10, 2); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE_SKIP)
|
||||
check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { return unw_set_cache_size(unw_local_addr_space, 1024, 0); }" LIBUNWIND_HAS_UNW_SET_CACHE_SIZE)
|
||||
check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { return unw_set_caching_policy(unw_local_addr_space, UNW_CACHE_PER_THREAD); }" LIBUNWIND_HAS_UNW_CACHE_PER_THREAD)
|
||||
set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
|
||||
--
|
||||
GitLab
|
||||
@@ -42,6 +42,15 @@ RDEPEND="${DEPEND}
|
||||
"
|
||||
BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
# This doesn't exist in libunwind (bug #898768).
|
||||
unw_backtrace_skip
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.5.0-c99.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
rm -rf 3rdparty/boost-zstd || die # ensure no bundling
|
||||
|
||||
@@ -41,6 +41,11 @@ RDEPEND="${DEPEND}
|
||||
"
|
||||
BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"
|
||||
|
||||
QA_CONFIG_IMPL_DECL_SKIP=(
|
||||
# This doesn't exist in libunwind (bug #898768).
|
||||
unw_backtrace_skip
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake_src_prepare
|
||||
rm -rf 3rdparty/boost-zstd || die # ensure no bundling
|
||||
|
||||
Reference in New Issue
Block a user