From a89dd56332904c0b1775ece759f53b603d3586f8 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 23 Jun 2023 17:16:27 +0200 Subject: [PATCH] Add valgrind-3.21.0-callgrind_control-no-strict.patch Resolves: #2214397 callgrind_control produces (strict perl) errors --- valgrind-3.21.0-callgrind_control-no-strict.patch | 12 ++++++++++++ valgrind.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 valgrind-3.21.0-callgrind_control-no-strict.patch diff --git a/valgrind-3.21.0-callgrind_control-no-strict.patch b/valgrind-3.21.0-callgrind_control-no-strict.patch new file mode 100644 index 0000000..2aaecd4 --- /dev/null +++ b/valgrind-3.21.0-callgrind_control-no-strict.patch @@ -0,0 +1,12 @@ +diff --git a/callgrind/callgrind_control.in b/callgrind/callgrind_control.in +index 083ffa29f..eb50c16ad 100644 +--- a/callgrind/callgrind_control.in ++++ b/callgrind/callgrind_control.in +@@ -22,7 +22,6 @@ + # You should have received a copy of the GNU General Public License + # along with this program; if not, see . + +-use strict; + use warnings; + + use File::Basename; diff --git a/valgrind.spec b/valgrind.spec index f040b6d..e149d3a 100644 --- a/valgrind.spec +++ b/valgrind.spec @@ -91,6 +91,10 @@ Patch5: valgrind-3.21.0-no-memcpy-replace-check.patch # https://bugs.kde.org/show_bug.cgi?id=469768 Patch6: valgrind-3.21.0-Add-with-gdbscripts-dir.patch +# Can't run callgrind_control with valgrind 3.21.0 because of perl errors +# https://bugs.kde.org/show_bug.cgi?id=470121 +Patch8: valgrind-3.21.0-callgrind_control-no-strict.patch + BuildRequires: make BuildRequires: glibc-devel @@ -229,9 +233,11 @@ Valgrind User Manual for details. %endif %patch5 -p1 - %patch6 -p1 +%patch8 -p1 + + %build # LTO triggers undefined symbols in valgrind. Valgrind has a --enable-lto # configure time option, but that doesn't seem to help. @@ -463,6 +469,9 @@ fi %endif %changelog +* Fri Jun 23 2023 Mark Wielaard +- Add valgrind-3.21.0-callgrind_control-no-strict.patch + * Tue May 16 2023 Alexandra Hájková - 3.21.0-3 - Add valgrind-3.21.0-Add-with-gdbscripts-dir.patch