summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-04-11 17:39:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-19 14:14:11 +0100
commit9b1f6a19982c76ce43afb5499008fd929585a1e8 (patch)
tree1aeda0288a5079d09fe298aae4ca6bcff94251b0 /meta/recipes-kernel
parentac5477c48258b8b52a6eb21d7bb2886446a8ed86 (diff)
downloadpoky-9b1f6a19982c76ce43afb5499008fd929585a1e8.tar.gz
systemtap: Fix build with gcc-12
Backport a patch to fix | ../git/util.cxx:1766:56: error: 'std::pointer_to_unary_function<_Arg, _Result> std::ptr_fun(_Result (*)(_Arg)) [with _Arg = int; _Result = int]' is deprecated: use 'std::function' instea d [-Werror=deprecated-declarations] | 1766 | std::not1(std::ptr_fun<int, int>(std::isspace)))); | | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~ (From OE-Core rev: 0b360d12203aafd8bf96433d11221a6ed910a11f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch49
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb3
2 files changed, 51 insertions, 1 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch b/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch
new file mode 100644
index 0000000000..f885c44460
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch
@@ -0,0 +1,49 @@
1From f199d1982ef8a6c6d5c06c082d057b8793bcc6aa Mon Sep 17 00:00:00 2001
2From: Serhei Makarov <serhei@serhei.io>
3Date: Fri, 21 Jan 2022 18:21:46 -0500
4Subject: [PATCH] gcc12 c++ compatibility re-tweak for rhel6: use function
5 pointer instead of lambdas instead of ptr_fun<>
6
7Saving 2 lines in ltrim/rtrim is probably not a good reason to drop
8compatibility with the RHEL6 system compiler. Actually declaring a
9named function and passing the function pointer is compatible with
10everything.
11
12Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=f199d1982ef8a6c6d5c06c082d057b8793bcc6aa]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 util.cxx | 13 ++++++++-----
16 1 file changed, 8 insertions(+), 5 deletions(-)
17
18--- a/util.cxx
19+++ b/util.cxx
20@@ -1757,21 +1757,24 @@ flush_to_stream (const string &fname, os
21 return 1; // Failure
22 }
23
24+int
25+not_isspace(unsigned char c)
26+{
27+ return !std::isspace(c);
28+}
29+
30 // trim from start (in place)
31 void
32 ltrim(std::string &s)
33 {
34- s.erase(s.begin(),
35- std::find_if(s.begin(), s.end(),
36- std::not1(std::ptr_fun<int, int>(std::isspace))));
37+ s.erase(s.begin(), std::find_if(s.begin(), s.end(), not_isspace));
38 }
39
40 // trim from end (in place)
41 void
42 rtrim(std::string &s)
43 {
44- s.erase(std::find_if(s.rbegin(), s.rend(),
45- std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
46+ s.erase(std::find_if(s.rbegin(), s.rend(), not_isspace).base(), s.end());
47 }
48
49 // trim from both ends (in place)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 04f7e03ab5..ce86d5274d 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -7,7 +7,8 @@ HOMEPAGE = "https://sourceware.org/systemtap/"
7require systemtap_git.inc 7require systemtap_git.inc
8 8
9SRC_URI += "file://0001-improve-reproducibility-for-c-compiling.patch \ 9SRC_URI += "file://0001-improve-reproducibility-for-c-compiling.patch \
10 file://0001-staprun-address-ncurses-6.3-failures.patch \ 10 file://0001-staprun-address-ncurses-6.3-failures.patch \
11 file://0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch \
11 " 12 "
12 13
13DEPENDS = "elfutils" 14DEPENDS = "elfutils"