From 8ea375589d68dfbf4eaf4974200c6a5a8b3a4b49 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Fri, 3 Nov 2023 15:46:18 +0100 Subject: valgrind: split helper scripts to separate packages, update dependencies The cachegrind scripts have been rewritten in python3, so the RDEPENDS on perl is no longer sufficient. This is unfortunately not caught by QA checks since the scripts use #! /usr/bin/env python3 as shebang line. Since the valgrind binary by itself can be quite useful on target, allow including that in the rootfs without also having to pull in the whole perl and python interpreters and stdlibs. (From OE-Core rev: 9797adebd1296f0cf08b1f6f6322fbc804aee14a) Signed-off-by: Rasmus Villemoes Signed-off-by: Richard Purdie --- meta/recipes-devtools/valgrind/valgrind_3.21.0.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'meta/recipes-devtools/valgrind') diff --git a/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb index 717d82830e..68ab319a1b 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.21.0.bb @@ -92,6 +92,18 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" # which fixes build path issue in DWARF. SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" +# Split out various helper scripts to separate packages to avoid the +# main package depending on perl and python. +PACKAGES =+ "${PN}-cachegrind ${PN}-massif ${PN}-callgrind" + +FILES:${PN}-cachegrind = "${bindir}/cg_*" +FILES:${PN}-massif = "${bindir}/ms_*" +FILES:${PN}-callgrind = "${bindir}/callgrind_*" + +RDEPENDS:${PN}-cachegrind = "${PN} python3-core" +RDEPENDS:${PN}-massif = "${PN} perl" +RDEPENDS:${PN}-callgrind = "${PN} perl" + do_configure:prepend () { rm -rf ${S}/config.h sed -i -e 's:$(abs_top_builddir):$(pkglibdir)/ptest:g' ${S}/none/tests/Makefile.am @@ -116,8 +128,6 @@ VALGRINDARCH:powerpc64le = "ppc64le" INHIBIT_PACKAGE_STRIP_FILES = "${PKGD}${libexecdir}/valgrind/vgpreload_memcheck-${VALGRINDARCH}-linux.so" -RDEPENDS:${PN} += "perl" - # valgrind needs debug information for ld.so at runtime in order to # redirect functions like strlen. RRECOMMENDS:${PN} += "${TCLIBC}-dbg" -- cgit v1.2.3-54-g00ecf