diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/sysprof/sysprof')
3 files changed, 30 insertions, 66 deletions
diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch new file mode 100644 index 0000000000..dc702a0e37 --- /dev/null +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch @@ -0,0 +1,30 @@ +From 19188367bee87b0084ab34869455155da5cb1731 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 08:47:39 -0700 +Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic + +This helps it to use llvm unwinder since libunwind-generic is specific +to nongnu libunwind. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2835782..0fdb39a 100644 +--- a/meson.build ++++ b/meson.build +@@ -81,7 +81,7 @@ config_h.set10('HAVE_POLKIT_AGENT', polkit_agent_dep.found()) + config_h.set10('HAVE_POLKIT', polkit_dep.found()) + + if get_option('libunwind') +- libunwind_dep = dependency('libunwind-generic') ++ libunwind_dep = dependency('libunwind') + config_h.set('ENABLE_LIBUNWIND', libunwind_dep.found()) + config_h.set('HAVE_UNW_SET_CACHE_SIZE', libunwind_dep.found() and cc.has_header_symbol('libunwind.h', 'unw_set_cache_size', dependencies: [libunwind_dep])) + endif +-- +2.35.2 + diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch deleted file mode 100644 index 75aa86cdbf..0000000000 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3025d80aaacc5f67aa9eb1e6fde30f71d9c5b04b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 18 Jul 2011 16:00:17 -0700 -Subject: [PATCH 1/2] sysprof: Define NT_GNU_BUILD_ID if undefined - -On uclibc elf.h does not have GNU extentions but we need this define -so we define it locally if its not getting it from elf.h - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending - -%% original patch: define-NT_GNU_BUILD_ID.patch ---- - src/libsysprof/elfparser.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/libsysprof/elfparser.h b/src/libsysprof/elfparser.h -index 160e4c9..94fa5c0 100644 ---- a/src/libsysprof/elfparser.h -+++ b/src/libsysprof/elfparser.h -@@ -18,6 +18,10 @@ - - #include <glib.h> - -+#ifndef NT_GNU_BUILD_ID -+#define NT_GNU_BUILD_ID 3 -+#endif -+ - typedef struct ElfSym ElfSym; - typedef struct ElfParser ElfParser; - --- -2.17.1 - diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch deleted file mode 100644 index d8fffbb7e9..0000000000 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen <oss@cogitri.dev> -Date: Sat, 7 Mar 2020 10:44:16 +0100 -Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for - gsize - -This fixes the build on 32-bit platforms with -Werror-format - -fixes #32 - -Upstream-Status: Applied[https://gitlab.gnome.org/GNOME/sysprof/-/commit/5dea152c7728f5a37370ad8a229115833e36b4f6] ---- - src/tests/allocs-by-size.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c -index 666113a..6260d4b 100644 ---- a/src/tests/allocs-by-size.c -+++ b/src/tests/allocs-by-size.c -@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader) - { - const Item *item = &g_array_index (ar, Item, i); - -- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n", -+ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n", - item->size, item->cmp, item->count); - } - } --- -2.21.3 - |