MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-16 15:25:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

sysprof: remove linux-gnueabi-patch

Browse Source 
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>
This commit is contained in:
Andreas Müller 2020-06-30 00:55:32 +02:00 committed by Khem Raj
parent 2927427fb5
commit ba2ce7364e
3 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch
View File

@ -1,42 +0,0 @@
From 43c39b5685445242d071b3706af2903efa508b4a Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
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 <alex.kanavin@gmail.com>
---
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],

0
meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch → meta-gnome/recipes-gnome/sysprof/sysprof/0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch
View File

3
meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb
View File

@ -18,8 +18,7 @@ SRC_URI[archive.md5sum] = "3956e82b8744715006dde59e0ce8910b"
SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108" SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108"
SRC_URI += " \ SRC_URI += " \
file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ 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://0002-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \
file://0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \
" "
PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}"