blob: 1869e11059212fa815b49595b45a657d1e01b509 [file] [log] [blame]
Brad Bishop6dbb3162019-11-25 09:41:34 -05001From b6d9bc97cb0e8c540a45dba5440b036fb940ff95 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@wdc.com>
3Date: Mon, 11 Nov 2019 09:38:15 -0800
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 -04005
6Make sure that we are also looking for our host_os combinations like
7linux-musl etc. when assuming support for DRM/KMS.
8
9Also delete a duplicate line.
10
Brad Bishop15ae2502019-06-18 21:44:24 -040011Upstream-Status: Pending
12
Brad Bishop393846f2019-05-20 12:24:11 -040013Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Brad Bishopa34c0302019-09-23 22:34:48 -040015Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Brad Bishop6dbb3162019-11-25 09:41:34 -050016Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
17
Brad Bishop393846f2019-05-20 12:24:11 -040018---
Brad Bishopa34c0302019-09-23 22:34:48 -040019 meson.build | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
Brad Bishop393846f2019-05-20 12:24:11 -040021
22diff --git a/meson.build b/meson.build
Brad Bishop6dbb3162019-11-25 09:41:34 -050023index d584152..a1f098c 100644
Brad Bishop393846f2019-05-20 12:24:11 -040024--- a/meson.build
25+++ b/meson.build
Brad Bishop6dbb3162019-11-25 09:41:34 -050026@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
Brad Bishop15ae2502019-06-18 21:44:24 -040027 # Only build shared_glapi if at least one OpenGL API is enabled
28 with_shared_glapi = get_option('shared-glapi') and with_any_opengl
Brad Bishop393846f2019-05-20 12:24:11 -040029
Brad Bishop6dbb3162019-11-25 09:41:34 -050030-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
Brad Bishopa34c0302019-09-23 22:34:48 -040031+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux')
32
Brad Bishop15ae2502019-06-18 21:44:24 -040033 dri_drivers = get_option('dri-drivers')
34 if dri_drivers.contains('auto')
Brad Bishop6dbb3162019-11-25 09:41:34 -050035@@ -856,7 +856,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
Brad Bishop393846f2019-05-20 12:24:11 -040036 endif
37
38 # TODO: this is very incomplete
Brad Bishopa34c0302019-09-23 22:34:48 -040039-if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
40+if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux')
Brad Bishop393846f2019-05-20 12:24:11 -040041 pre_args += '-D_GNU_SOURCE'
Brad Bishop6dbb3162019-11-25 09:41:34 -050042 elif host_machine.system() == 'sunos'
43 pre_args += '-D__EXTENSIONS__'