diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch')
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch b/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch deleted file mode 100644 index 235489226..000000000 --- a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-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 <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 = [ - polkit_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], |