diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2020-06-30 00:55:32 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-06-30 07:58:37 -0700 |
commit | ba2ce7364e2f95f9bdceffbcc8c83653884df2fc (patch) | |
tree | e5eaae7e5a8035c930e7f1bd6bc8a66ed165a949 /meta-gnome | |
parent | 2927427fb53eb4a9b99af1400ca9b8f781c23330 (diff) | |
download | meta-openembedded-ba2ce7364e2f95f9bdceffbcc8c83653884df2fc.tar.gz |
sysprof: remove linux-gnueabi-patch
meson.bbclass takes care since oe-core
commit 010202076760329829fbde8dab4f535d6f755873
Author: Andreas M?ller <schnitzeltony@gmail.com>
Date: Thu Apr 16 00:30:36 2020 +0200
meson.bbclass: avoid unexpected operating-system names
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch | 42 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch (renamed from meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch) | 0 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb | 3 |
3 files changed, 1 insertions, 44 deletions
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 9db111e8e..000000000 --- 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 @@ | |||
1 | From 43c39b5685445242d071b3706af2903efa508b4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 14 Jan 2020 12:58:27 +0100 | ||
4 | Subject: [PATCH] meson.build: do not hardcode 'linux' as | ||
5 | host_machine().system() value | ||
6 | |||
7 | In some build environmets such as OpenEmbedded this can be 'linux-gnueabi' | ||
8 | or otherwise not exactly 'linux'. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | src/libsysprof/meson.build | 2 +- | ||
14 | src/tools/meson.build | 2 +- | ||
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build | ||
18 | index 3449961..3c2d186 100644 | ||
19 | --- a/src/libsysprof/meson.build | ||
20 | +++ b/src/libsysprof/meson.build | ||
21 | @@ -84,7 +84,7 @@ libsysprof_deps = [ | ||
22 | librax_dep, | ||
23 | ] | ||
24 | |||
25 | -if host_machine.system() == 'linux' | ||
26 | +if host_machine.system().contains('linux') | ||
27 | libsysprof_public_sources += [ | ||
28 | 'sysprof-memory-source.c', | ||
29 | 'sysprof-perf-counter.c', | ||
30 | diff --git a/src/tools/meson.build b/src/tools/meson.build | ||
31 | index 670052a..3fb7f0c 100644 | ||
32 | --- a/src/tools/meson.build | ||
33 | +++ b/src/tools/meson.build | ||
34 | @@ -2,7 +2,7 @@ tools_deps = [ | ||
35 | libsysprof_capture_dep, | ||
36 | ] | ||
37 | |||
38 | -if get_option('libsysprof') and host_machine.system() == 'linux' | ||
39 | +if get_option('libsysprof') and host_machine.system().contains('linux') | ||
40 | polkit_agent_dep = dependency('polkit-agent-1') | ||
41 | sysprof_cli = executable('sysprof-cli', 'sysprof-cli.c', | ||
42 | dependencies: tools_deps + [libsysprof_dep, polkit_dep, polkit_agent_dep], | ||
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/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch index d8fffbb7e..d8fffbb7e 100644 --- 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/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch | |||
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 a769dbf7d..275fbaa69 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" | |||
18 | SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108" | 18 | SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108" |
19 | SRC_URI += " \ | 19 | SRC_URI += " \ |
20 | file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ | 20 | file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ |
21 | file://0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch \ | 21 | file://0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ |
22 | file://0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ | ||
23 | " | 22 | " |
24 | 23 | ||
25 | PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" | 24 | PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" |