| From d092a9000da62dfccca5b58fca56b94eb9989c48 Mon Sep 17 00:00:00 2001 |
| From: Alistair Francis <alistair@alistair23.me> |
| Date: Thu, 14 Nov 2019 13:04:49 -0800 |
| Subject: [PATCH] meson.build: check for all linux host_os combinations |
| |
| Make sure that we are also looking for our host_os combinations like |
| linux-musl etc. when assuming support for DRM/KMS. |
| |
| Also delete a duplicate line. |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
| Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
| Signed-off-by: Alistair Francis <alistair@alistair23.me> |
| |
| --- |
| meson.build | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/meson.build b/meson.build |
| index 250b528..b5c98f8 100644 |
| --- a/meson.build |
| +++ b/meson.build |
| @@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
| # Only build shared_glapi if at least one OpenGL API is enabled |
| with_shared_glapi = with_shared_glapi and with_any_opengl |
| |
| -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) |
| +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
| |
| dri_drivers = get_option('dri-drivers') |
| if dri_drivers.length() != 0 |
| @@ -1091,7 +1091,7 @@ if cc.has_function('reallocarray') |
| endif |
| |
| # TODO: this is very incomplete |
| -if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android'].contains(host_machine.system()) |
| +if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
| pre_args += '-D_GNU_SOURCE' |
| elif host_machine.system() == 'sunos' |
| pre_args += '-D__EXTENSIONS__' |