commit: 50e334876dbbd54b22db3882de1016b2467c615a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 1 22:26:00 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 1 22:26:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50e33487
sys-apps/kbd: update live for Valgrind change upstream Bug: https://bugs.gentoo.org/956964 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/kbd/kbd-2.8.0.ebuild | 3 +++ sys-apps/kbd/kbd-9999.ebuild | 11 ++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sys-apps/kbd/kbd-2.8.0.ebuild b/sys-apps/kbd/kbd-2.8.0.ebuild index 49aecd071817..d7923299f9eb 100644 --- a/sys-apps/kbd/kbd-2.8.0.ebuild +++ b/sys-apps/kbd/kbd-2.8.0.ebuild @@ -83,6 +83,9 @@ src_test() { # Workaround Valgrind being mandatory for tests # https://github.com/legionus/kbd/issues/133 (bug #956964) + # + # XXX: Drop this on next release (>2.8.0) and replace with + # --disable-memcheck in configure. cat <<-EOF > tests/valgrind.sh || die #!/bin/sh shift diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild index 49aecd071817..538d6285889b 100644 --- a/sys-apps/kbd/kbd-9999.ebuild +++ b/sys-apps/kbd/kbd-9999.ebuild @@ -67,6 +67,8 @@ src_configure() { local myeconfargs=( --disable-werror + # No Valgrind for the testsuite + --disable-memcheck $(use_enable nls) $(use_enable pam vlock) @@ -81,15 +83,6 @@ src_test() { # when running via the ebuild. sed -i -e "s:tty 2>/dev/null:false:" tests/testsuite || die - # Workaround Valgrind being mandatory for tests - # https://github.com/legionus/kbd/issues/133 (bug #956964) - cat <<-EOF > tests/valgrind.sh || die - #!/bin/sh - shift - exec "\$@" 1>stdout 2>stderr - EOF - chmod +x tests/valgrind.sh || die - emake -Onone check TESTSUITEFLAGS="--jobs=$(get_makeopts_jobs)" }
