From ba2ce7364e2f95f9bdceffbcc8c83653884df2fc Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 30 Jun 2020 00:55:32 +0200 Subject: sysprof: remove linux-gnueabi-patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit meson.bbclass takes care since oe-core commit 010202076760329829fbde8dab4f535d6f755873 Author: Andreas M?ller Date: Thu Apr 16 00:30:36 2020 +0200 meson.bbclass: avoid unexpected operating-system names Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...-do-not-hardcode-linux-as-host_machine-.s.patch | 42 ---------------------- ..._GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch | 31 ++++++++++++++++ ..._GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch | 31 ---------------- meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb | 3 +- 4 files changed, 32 insertions(+), 75 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch create mode 100644 meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch delete mode 100644 meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch deleted file mode 100644 index 9db111e8ec..0000000000 --- a/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 43c39b5685445242d071b3706af2903efa508b4a Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 14 Jan 2020 12:58:27 +0100 -Subject: [PATCH] meson.build: do not hardcode 'linux' as - host_machine().system() value - -In some build environmets such as OpenEmbedded this can be 'linux-gnueabi' -or otherwise not exactly 'linux'. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin ---- - src/libsysprof/meson.build | 2 +- - src/tools/meson.build | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build -index 3449961..3c2d186 100644 ---- a/src/libsysprof/meson.build -+++ b/src/libsysprof/meson.build -@@ -84,7 +84,7 @@ libsysprof_deps = [ - librax_dep, - ] - --if host_machine.system() == 'linux' -+if host_machine.system().contains('linux') - libsysprof_public_sources += [ - 'sysprof-memory-source.c', - 'sysprof-perf-counter.c', -diff --git a/src/tools/meson.build b/src/tools/meson.build -index 670052a..3fb7f0c 100644 ---- a/src/tools/meson.build -+++ b/src/tools/meson.build -@@ -2,7 +2,7 @@ tools_deps = [ - libsysprof_capture_dep, - ] - --if get_option('libsysprof') and host_machine.system() == 'linux' -+if get_option('libsysprof') and host_machine.system().contains('linux') - polkit_agent_dep = dependency('polkit-agent-1') - sysprof_cli = executable('sysprof-cli', 'sysprof-cli.c', - dependencies: tools_deps + [libsysprof_dep, polkit_dep, polkit_agent_dep], 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 new file mode 100644 index 0000000000..d8fffbb7e9 --- /dev/null +++ b/meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch @@ -0,0 +1,31 @@ +From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen +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 + diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch b/meta-gnome/recipes-gnome/sysprof/sysprof/0003-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/0003-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 -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 - diff --git a/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb b/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb index a769dbf7da..275fbaa699 100644 --- a/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb +++ b/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb @@ -18,8 +18,7 @@ SRC_URI[archive.md5sum] = "3956e82b8744715006dde59e0ce8910b" SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108" SRC_URI += " \ file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ - file://0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch \ - file://0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ + file://0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ " PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" -- cgit v1.2.3-54-g00ecf