commit: 3afad1db23512c841990175c1a904b052160b82b Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com> AuthorDate: Tue Oct 10 19:06:02 2023 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Thu Feb 26 10:05:07 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3afad1db
dev-util/kernelshark: fix incompatible function pointer types assigning And other misc stuff leading to build failuer in musl libc Closes: https://bugs.gentoo.org/895838 Closes: https://github.com/gentoo/gentoo/pull/33287 Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com> Signed-off-by: Brahmajit Das <listout <AT> listout.xyz> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> .../kernelshark-2.4.0-fix-build-clang16.patch | 50 ++++++++++++++++++++++ dev-util/kernelshark/kernelshark-2.4.0-r1.ebuild | 3 +- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/dev-util/kernelshark/files/kernelshark-2.4.0-fix-build-clang16.patch b/dev-util/kernelshark/files/kernelshark-2.4.0-fix-build-clang16.patch new file mode 100644 index 000000000000..c4d4d7a6bafd --- /dev/null +++ b/dev-util/kernelshark/files/kernelshark-2.4.0-fix-build-clang16.patch @@ -0,0 +1,50 @@ +Bug: https://bugs.gentoo.org/895838 +--- a/src/kernelshark.cpp ++++ b/src/kernelshark.cpp +@@ -7,6 +7,7 @@ + // C + #include <sys/stat.h> + #include <getopt.h> ++#include <libgen.h> + + // Qt + #include <QApplication> +--- a/src/libkshark-tepdata.c ++++ b/src/libkshark-tepdata.c +@@ -1201,13 +1201,13 @@ static void kshark_tep_init_methods(struct kshark_generic_stream_interface *inte + interface->get_event_name = tepdata_get_event_name; + interface->aux_info= tepdata_get_latency; + interface->get_info = tepdata_get_info; +- interface->find_event_id = tepdata_find_event_id; ++ interface->find_event_id = (stream_find_id_func) tepdata_find_event_id; + interface->get_all_event_ids = tepdata_get_event_ids; + interface->dump_entry = tepdata_dump_entry; + interface->get_all_event_field_names = tepdata_get_field_names; + interface->get_event_field_type = tepdata_get_field_type; +- interface->read_record_field_int64 = tepdata_read_record_field; +- interface->read_event_field_int64 = tepdata_read_event_field; ++ interface->read_record_field_int64 = (stream_read_record_field)tepdata_read_record_field; ++ interface->read_event_field_int64 = (stream_read_event_field) tepdata_read_event_field; + interface->load_entries = tepdata_load_entries; + interface->load_matrix = tepdata_load_matrix; + } +--- a/src/libkshark.h ++++ b/src/libkshark.h +@@ -17,6 +17,7 @@ + #include <string.h> + #include <pthread.h> + #include <errno.h> ++#include <sys/types.h> + + // Json-C + #include <json-c/json.h> +--- a/src/plugins/sched_events.c ++++ b/src/plugins/sched_events.c +@@ -14,6 +14,7 @@ + #include <stdio.h> + + // trace-cmd ++#define _GNU_SOURCE /* See feature_test_macros(7) */ + #include <trace-cmd.h> + + // KernelShark diff --git a/dev-util/kernelshark/kernelshark-2.4.0-r1.ebuild b/dev-util/kernelshark/kernelshark-2.4.0-r1.ebuild index f3fae78cbd8f..643de1c81c7d 100644 --- a/dev-util/kernelshark/kernelshark-2.4.0-r1.ebuild +++ b/dev-util/kernelshark/kernelshark-2.4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2025 Gentoo Authors +# Copyright 2019-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -48,6 +48,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.1.0-no-ldconfig.patch "${FILESDIR}"/${PN}-2.3.1-algorithm.patch + "${FILESDIR}"/${PN}-2.4.0-fix-build-clang16.patch ) src_configure() {
