0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  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. In some build environmets such as OpenEmbedded this can be 'linux-gnueabi'
  7. or otherwise not exactly 'linux'.
  8. Upstream-Status: Pending
  9. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  10. ---
  11. src/libsysprof/meson.build | 2 +-
  12. src/tools/meson.build | 2 +-
  13. 2 files changed, 2 insertions(+), 2 deletions(-)
  14. diff --git a/src/libsysprof/meson.build b/src/libsysprof/meson.build
  15. index 3449961..3c2d186 100644
  16. --- a/src/libsysprof/meson.build
  17. +++ b/src/libsysprof/meson.build
  18. @@ -84,7 +84,7 @@ libsysprof_deps = [
  19. librax_dep,
  20. ]
  21. -if host_machine.system() == 'linux'
  22. +if host_machine.system().contains('linux')
  23. libsysprof_public_sources += [
  24. 'sysprof-memory-source.c',
  25. 'sysprof-perf-counter.c',
  26. diff --git a/src/tools/meson.build b/src/tools/meson.build
  27. index 670052a..3fb7f0c 100644
  28. --- a/src/tools/meson.build
  29. +++ b/src/tools/meson.build
  30. @@ -2,7 +2,7 @@ tools_deps = [
  31. libsysprof_capture_dep,
  32. ]
  33. -if get_option('libsysprof') and host_machine.system() == 'linux'
  34. +if get_option('libsysprof') and host_machine.system().contains('linux')
  35. polkit_agent_dep = dependency('polkit-agent-1')
  36. sysprof_cli = executable('sysprof-cli', 'sysprof-cli.c',
  37. dependencies: tools_deps + [libsysprof_dep, polkit_dep, polkit_agent_dep],