commit: 4a8013bb5de85019d6c50d422e79fd1a049a277a Author: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail <DOT> com> AuthorDate: Fri May 30 13:42:14 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 30 14:50:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8013bb
dev-util/kcov: drop 40 Signed-off-by: Mattéo Rossillol‑‑Laruelle <beatussum <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42350 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/kcov/Manifest | 1 - dev-util/kcov/files/kcov-40-binutils-2.39.patch | 92 ------------------------- dev-util/kcov/files/kcov-40-gcc-13.patch | 45 ------------ dev-util/kcov/kcov-40.ebuild | 43 ------------ dev-util/kcov/metadata.xml | 6 -- 5 files changed, 187 deletions(-) diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest index 47b81bac6c6c..069cbfb3c717 100644 --- a/dev-util/kcov/Manifest +++ b/dev-util/kcov/Manifest @@ -1,2 +1 @@ -DIST kcov-40.tar.gz 311012 BLAKE2B 19b3cf681fe3c722fde116f454e1760ddd1e54db6fcecc05eca3ec585524fa7d1f7af3ea237943c8a68a81384567205ea443d1542ec380621d35a6f3e3dc667e SHA512 5abe1dd94fbe93fe73d658840593781216b8562a87d010a94d4520e29dd4d537e167de64b7f535347f894c68d5d8b9974ee4b9fd2cebf9291bac4ddbb9ac7cff DIST kcov-43.tar.gz 259022 BLAKE2B 7d6da38ec93f6e7904372b0917ce86e544cd9abcaff4d21354b7c5cc40c91be37c62bbedbc7fcc449ec24fa8815503c0ed355996eef9721aab0a65ed9a1c203e SHA512 11158c63a4eb5fdb34b4787c135e3c8db60e6d3292fc109fcfb43e6dab30c6c4310b09c6d94614556eb005792bab235c6cd839c585c3a98f5700c4ee4d317aca diff --git a/dev-util/kcov/files/kcov-40-binutils-2.39.patch b/dev-util/kcov/files/kcov-40-binutils-2.39.patch deleted file mode 100644 index 88029305c90f..000000000000 --- a/dev-util/kcov/files/kcov-40-binutils-2.39.patch +++ /dev/null @@ -1,92 +0,0 @@ -https://github.com/SimonKagstrom/kcov/commit/fd1a4fd2f02cee49afd74e427e38c61b89154582 -https://bugs.gentoo.org/868114 - -From fd1a4fd2f02cee49afd74e427e38c61b89154582 Mon Sep 17 00:00:00 2001 -From: oreo639 <[email protected]> -Date: Wed, 14 Sep 2022 16:02:17 -0700 -Subject: [PATCH] Fix build with binutils 2.39 - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -94,6 +94,7 @@ set (DISASSEMBLER_SRCS - ) - - set (HAS_LIBBFD "0") -+set (HAS_LIBBFD_DISASM_STYLED "0") - - if (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64") - if (LIBBFD_FOUND) -@@ -106,6 +107,23 @@ if (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STR - ${LIBBFD_BFD_LIBRARY} - ${LIBBFD_IBERTY_LIBRARY} - ) -+ include(CheckCSourceCompiles) -+ set(CMAKE_REQUIRED_LIBRARIES ${DISASSEMBLER_LIBRARIES}) -+ check_c_source_compiles(" -+ #define PACKAGE -+ #define PACKAGE_VERSION -+ #include <stdio.h> -+ #include <dis-asm.h> -+ -+ int main(int argc, char **argv){ -+ struct disassemble_info info; -+ init_disassemble_info(&info, stdout, NULL, NULL); -+ return 0; -+ } -+ " TEST_LIBBFD_DISASM_STYLED) -+ if (TEST_LIBBFD_DISASM_STYLED) -+ set (HAS_LIBBFD_DISASM_STYLED "1") -+ endif (TEST_LIBBFD_DISASM_STYLED) - endif (LIBBFD_FOUND) - endif (CMAKE_TARGET_ARCHITECTURES STREQUAL "i386" OR CMAKE_TARGET_ARCHITECTURES STREQUAL "x86_64") - -@@ -284,7 +302,7 @@ set (KCOV_SYSTEM_MODE_SRCS - - set (KCOV_LIBRARY_PREFIX "/tmp") - --set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX} -DKCOV_HAS_LIBBFD=${HAS_LIBBFD}") -+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -g -Wall -D_GLIBCXX_USE_NANOSLEEP -DKCOV_LIBRARY_PREFIX=${KCOV_LIBRARY_PREFIX} -DKCOV_HAS_LIBBFD=${HAS_LIBBFD} -DKCOV_LIBFD_DISASM_STYLED=${HAS_LIBBFD_DISASM_STYLED}") - - include_directories( - include/ ---- a/src/parsers/bfd-disassembler.cc -+++ b/src/parsers/bfd-disassembler.cc -@@ -75,7 +75,11 @@ class BfdDisassembler : public IDisassembler - BfdDisassembler() - { - memset(&m_info, 0, sizeof(m_info)); -+#if KCOV_LIBFD_DISASM_STYLED -+ init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic, BfdDisassembler::opcodesFprintStyledFuncStatic); -+#else - init_disassemble_info(&m_info, (void *)this, BfdDisassembler::opcodesFprintFuncStatic); -+#endif - m_disassembler = print_insn_i386; - - m_info.arch = bfd_arch_i386; -@@ -407,6 +411,25 @@ class BfdDisassembler : public IDisassembler - return out; - } - -+#if KCOV_LIBFD_DISASM_STYLED -+ static int opcodesFprintStyledFuncStatic(void *info, enum disassembler_style style, const char *fmt, ...) -+ { -+ (void)style; -+ BfdDisassembler *pThis = (BfdDisassembler *)info; -+ char str[64]; -+ int out; -+ -+ va_list args; -+ va_start (args, fmt); -+ out = vsnprintf( str, sizeof(str) - 1, fmt, args ); -+ va_end (args); -+ -+ pThis->opcodesFprintFunc(str); -+ -+ return out; -+ } -+#endif -+ - typedef std::map<uint64_t, Section *> SectionCache_t; - typedef std::unordered_map<uint64_t, Instruction> InstructionAddressMap_t; - typedef std::map<uint64_t, Instruction *> InstructionOrderedMap_t; - diff --git a/dev-util/kcov/files/kcov-40-gcc-13.patch b/dev-util/kcov/files/kcov-40-gcc-13.patch deleted file mode 100644 index ea92a6b8364c..000000000000 --- a/dev-util/kcov/files/kcov-40-gcc-13.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/SimonKagstrom/kcov/commit/b63754b53b3a7cf43e13ec56bd0be76cb6175437 - -From b63754b53b3a7cf43e13ec56bd0be76cb6175437 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <[email protected]> -Date: Thu, 15 Sep 2022 19:55:21 +0100 -Subject: [PATCH] Fix build on gcc-13: add missing <stdint.h> include - -[ 15%] Building CXX object src/CMakeFiles/kcov.dir/writers/cobertura-writer.cc.o -In file included from kcov/src/writers/cobertura-writer.cc:6: -kcov/src/include/reporter.hh:24:90: error: 'uint64_t' has not been declared - 24 | LineExecutionCount(unsigned int hits, unsigned int possibleHits, uint64_t order) : - | ^~~~~~~~ ---- a/src/include/collector.hh -+++ b/src/include/collector.hh -@@ -2,6 +2,8 @@ - - #include <string> - -+#include <stdint.h> -+ - namespace kcov - { - class IFileParser; ---- a/src/include/reporter.hh -+++ b/src/include/reporter.hh -@@ -3,6 +3,7 @@ - #include <string> - - #include <stddef.h> -+#include <stdint.h> - - namespace kcov - { ---- a/src/include/source-file-cache.hh -+++ b/src/include/source-file-cache.hh -@@ -3,6 +3,8 @@ - #include <vector> - #include <string> - -+#include <stdint.h> -+ - namespace kcov - { - /** - diff --git a/dev-util/kcov/kcov-40.ebuild b/dev-util/kcov/kcov-40.ebuild deleted file mode 100644 index acf228ac0b9d..000000000000 --- a/dev-util/kcov/kcov-40.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake python-any-r1 - -DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash" -HOMEPAGE="https://github.com/SimonKagstrom/kcov"; -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/SimonKagstrom/${PN}.git"; - inherit git-r3 -else - SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+binutils" - -RDEPEND="dev-libs/elfutils - net-misc/curl - sys-libs/zlib - binutils? ( sys-libs/binutils-libs:= )" -DEPEND="${RDEPEND}" -BDEPEND="${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/${P}-binutils-2.39.patch - "${FILESDIR}"/${P}-gcc-13.patch -) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Bfd=$(usex !binutils) - - -DKCOV_INSTALL_DOCDIR=share/doc/${PF} - ) - - cmake_src_configure -} diff --git a/dev-util/kcov/metadata.xml b/dev-util/kcov/metadata.xml index 57ed59414176..ca2d56d759b9 100644 --- a/dev-util/kcov/metadata.xml +++ b/dev-util/kcov/metadata.xml @@ -32,12 +32,6 @@ la collecte d'information de couverture sans variations d'un compilateur à l'autre. </longdescription> - <use> - <flag name="binutils">Use <pkg>sys-libs/binutils-libs</pkg> for `--verify` support</flag> - </use> - <use lang="fr"> - <flag name="binutils">Utiliser <pkg>sys-libs/binutils-libs</pkg> pour le support de `--verify`</flag> - </use> <upstream> <maintainer status="active"> <name>Simon Kågström</name>
