| Brad Bishop | 34ae600 | 2019-04-08 15:21:03 -0400 | [diff] [blame^] | 1 | From de0d33b068a5d8e61cc0c82d88d15b9a8aa97977 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Sat, 6 Apr 2019 18:07:17 +0200 |
| 4 | Subject: [PATCH] meson.build: Disable libseccomp for all archs |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | It does not seem mandatory and can cause unsatisfied dependency [1]. |
| 10 | |
| 11 | [1] https://errors.yoctoproject.org/Errors/Details/235565/ |
| 12 | |
| 13 | Upstream-Status: Inappropriate [configuration] |
| 14 | |
| 15 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 16 | --- |
| 17 | meson.build | 7 +------ |
| 18 | 1 file changed, 1 insertion(+), 6 deletions(-) |
| 19 | |
| 20 | diff --git a/meson.build b/meson.build |
| 21 | index 83407b4..80eab84 100644 |
| 22 | --- a/meson.build |
| 23 | +++ b/meson.build |
| 24 | @@ -53,12 +53,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) |
| 25 | host_os = host_machine.system() |
| 26 | host_cpu = host_machine.cpu() |
| 27 | supported_os = ['linux'] |
| 28 | -unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64'] |
| 29 | -if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) |
| 30 | - seccomp_dep = dependency('libseccomp') |
| 31 | -else |
| 32 | - seccomp_dep = dependency('', required: false) |
| 33 | -endif |
| 34 | +seccomp_dep = dependency('', required: false) |
| 35 | fontconfig_cache_path = fontconfig_dep.get_pkgconfig_variable('cachedir') |
| 36 | |
| 37 | xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') |
| 38 | -- |
| 39 | 2.20.1 |
| 40 | |