diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-11-22 16:41:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-23 23:35:19 +0000 |
commit | 5d0023380230bb0727462a98d08ec86d86169f74 (patch) | |
tree | 02eef91dcd857d5ff2acc06de5a83a0ad16aa513 /meta/recipes-kernel/sysprof/files | |
parent | 60973c804e562360084050395148d2f88cbadd32 (diff) | |
download | poky-5d0023380230bb0727462a98d08ec86d86169f74.tar.gz |
sysprof: update to 3.30.2
(From OE-Core rev: c2a63b10300cab8bc896fdd2509bb06cc08ac420)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/sysprof/files')
-rw-r--r-- | meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch | 34 | ||||
-rw-r--r-- | meta/recipes-kernel/sysprof/files/wordsize.patch | 38 |
2 files changed, 0 insertions, 72 deletions
diff --git a/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch b/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch deleted file mode 100644 index 38f9f5f66a..0000000000 --- a/meta/recipes-kernel/sysprof/files/0001-fix-non-literal-format-string-issues.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From de13d1f908335cc882c447e4d7c4360b9e5da190 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 6 Sep 2018 17:49:44 -0700 | ||
4 | Subject: [PATCH] fix non-literal format string issues | ||
5 | |||
6 | clang errors out when using -Werror=format-nonliteral | ||
7 | since the definition of g_strdup_vprintf() from glib-2.0 | ||
8 | is using va_list and clangs still warns where as | ||
9 | gcc doesn't do that for va_list arguments | ||
10 | |||
11 | Fixes | ||
12 | src/sp-window.c:96:27: error: format string is not a string literal [-Werror,-Wformat-nonliteral] | ||
13 | | str = g_strdup_vprintf (format, args); | ||
14 | | ^~~~~~ | ||
15 | |||
16 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/merge_requests/6] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | src/sp-window.c | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/src/sp-window.c b/src/sp-window.c | ||
23 | index 4dfac2d..aff4779 100644 | ||
24 | --- a/src/sp-window.c | ||
25 | +++ b/src/sp-window.c | ||
26 | @@ -80,7 +80,7 @@ static guint signals [N_SIGNALS]; | ||
27 | static void sp_window_set_profiler (SpWindow *self, | ||
28 | SpProfiler *profiler); | ||
29 | |||
30 | -static void | ||
31 | +static G_GNUC_PRINTF(3, 4) void | ||
32 | sp_window_notify_user (SpWindow *self, | ||
33 | GtkMessageType message_type, | ||
34 | const gchar *format, | ||
diff --git a/meta/recipes-kernel/sysprof/files/wordsize.patch b/meta/recipes-kernel/sysprof/files/wordsize.patch deleted file mode 100644 index d65b13a682..0000000000 --- a/meta/recipes-kernel/sysprof/files/wordsize.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/merge_requests/5] | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From bc7e3e27c28d0bab8bea72f2314191532b2e7840 Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Fri, 7 Sep 2018 01:30:09 +0100 | ||
7 | Subject: [PATCH] capture: use size of void* instead of glibc-specific | ||
8 | __WORDSIZE | ||
9 | |||
10 | __WORDSIZE is glibc-specific so sp-capture-types.h doesn't work with musl. | ||
11 | --- | ||
12 | lib/capture/sp-capture-types.h | 6 ++++-- | ||
13 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/lib/capture/sp-capture-types.h b/lib/capture/sp-capture-types.h | ||
16 | index 48fcfb8..1d6cd1d 100644 | ||
17 | --- a/lib/capture/sp-capture-types.h | ||
18 | +++ b/lib/capture/sp-capture-types.h | ||
19 | @@ -32,12 +32,14 @@ G_BEGIN_DECLS | ||
20 | #define SP_CAPTURE_MAGIC (GUINT32_TO_LE(0xFDCA975E)) | ||
21 | #define SP_CAPTURE_ALIGN (sizeof(SpCaptureAddress)) | ||
22 | |||
23 | -#if __WORDSIZE == 64 | ||
24 | +#if GLIB_SIZEOF_VOID_P == 8 | ||
25 | # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE000000000000000) | ||
26 | # define SP_CAPTURE_ADDRESS_FORMAT "0x%016lx" | ||
27 | -#else | ||
28 | +#elif GLIB_SIZEOF_VOID_P == 4 | ||
29 | # define SP_CAPTURE_JITMAP_MARK G_GUINT64_CONSTANT(0xE0000000) | ||
30 | # define SP_CAPTURE_ADDRESS_FORMAT "0x%016llx" | ||
31 | +#else | ||
32 | +#error Unknown GLIB_SIZEOF_VOID_P | ||
33 | #endif | ||
34 | |||
35 | #define SP_CAPTURE_CURRENT_TIME (sp_clock_get_current_time()) | ||
36 | -- | ||
37 | 2.11.0 | ||
38 | |||