| Brad Bishop | 0e2770c | 2020-01-21 07:31:46 -0500 | [diff] [blame] | 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 = [ |
| Andrew Geissler | 89770b0 | 2020-06-13 10:40:47 -0500 | [diff] [blame^] | 22 | librax_dep, |
| Brad Bishop | 0e2770c | 2020-01-21 07:31:46 -0500 | [diff] [blame] | 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], |