Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 1 | From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 3 | Date: Wed, 12 Jun 2019 13:40:20 -0300 |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 4 | Subject: [PATCH] meson.build: check for all linux host_os combinations |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 5 | Organization: O.S. Systems Software LTDA. |
| 6 | |
| 7 | Make sure that we are also looking for our host_os combinations like |
| 8 | linux-musl etc. when assuming support for DRM/KMS. |
| 9 | |
| 10 | Also delete a duplicate line. |
| 11 | |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 12 | Upstream-Status: Pending |
| 13 | |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
| 15 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 16 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 17 | --- |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 18 | meson.build | 4 ++-- |
| 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 20 | |
| 21 | diff --git a/meson.build b/meson.build |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 22 | index 567a81afd6f..b33b430aed4 100644 |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 23 | --- a/meson.build |
| 24 | +++ b/meson.build |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 25 | @@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 26 | # 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 Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 28 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 29 | -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 Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 32 | dri_drivers = get_option('dri-drivers') |
| 33 | if dri_drivers.contains('auto') |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 34 | @@ -845,7 +845,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 35 | endif |
| 36 | |
| 37 | # TODO: this is very incomplete |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 38 | -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 Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 40 | pre_args += '-D_GNU_SOURCE' |
| 41 | endif |
| 42 | |