blob: 9fba5da4b2fc0bc30a50c8c325f142bff5cb10bc [file] [log] [blame]
Brad Bishopa34c0302019-09-23 22:34:48 -04001From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00 2001
Brad Bishop393846f2019-05-20 12:24:11 -04002From: Fabio Berton <fabio.berton@ossystems.com.br>
Brad Bishop15ae2502019-06-18 21:44:24 -04003Date: Wed, 12 Jun 2019 13:40:20 -0300
Brad Bishopa34c0302019-09-23 22:34:48 -04004Subject: [PATCH] meson.build: check for all linux host_os combinations
Brad Bishop393846f2019-05-20 12:24:11 -04005Organization: O.S. Systems Software LTDA.
6
7Make sure that we are also looking for our host_os combinations like
8linux-musl etc. when assuming support for DRM/KMS.
9
10Also delete a duplicate line.
11
Brad Bishop15ae2502019-06-18 21:44:24 -040012Upstream-Status: Pending
13
Brad Bishop393846f2019-05-20 12:24:11 -040014Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Brad Bishopa34c0302019-09-23 22:34:48 -040016Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Brad Bishop393846f2019-05-20 12:24:11 -040017---
Brad Bishopa34c0302019-09-23 22:34:48 -040018 meson.build | 4 ++--
19 1 file changed, 2 insertions(+), 2 deletions(-)
Brad Bishop393846f2019-05-20 12:24:11 -040020
21diff --git a/meson.build b/meson.build
Brad Bishopa34c0302019-09-23 22:34:48 -040022index 567a81afd6f..b33b430aed4 100644
Brad Bishop393846f2019-05-20 12:24:11 -040023--- a/meson.build
24+++ b/meson.build
Brad Bishopa34c0302019-09-23 22:34:48 -040025@@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
Brad Bishop15ae2502019-06-18 21:44:24 -040026 # Only build shared_glapi if at least one OpenGL API is enabled
27 with_shared_glapi = get_option('shared-glapi') and with_any_opengl
Brad Bishop393846f2019-05-20 12:24:11 -040028
Brad Bishopa34c0302019-09-23 22:34:48 -040029-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system())
30+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux')
31
Brad Bishop15ae2502019-06-18 21:44:24 -040032 dri_drivers = get_option('dri-drivers')
33 if dri_drivers.contains('auto')
Brad Bishopa34c0302019-09-23 22:34:48 -040034@@ -845,7 +845,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));',
Brad Bishop393846f2019-05-20 12:24:11 -040035 endif
36
37 # TODO: this is very incomplete
Brad Bishopa34c0302019-09-23 22:34:48 -040038-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
39+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux')
Brad Bishop393846f2019-05-20 12:24:11 -040040 pre_args += '-D_GNU_SOURCE'
41 endif
42