Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From da6b9188f29942684d4262f0c6264d09bb6fe7de 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 |
| 4 | Subject: [PATCH 1/3] 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> |
| 16 | --- |
| 17 | meson.build | 6 +++--- |
| 18 | 1 file changed, 3 insertions(+), 3 deletions(-) |
| 19 | |
| 20 | diff --git a/meson.build b/meson.build |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 21 | index 8ab8a550f56..e11880f2902 100644 |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 22 | --- a/meson.build |
| 23 | +++ b/meson.build |
| 24 | @@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp') |
| 25 | |
| 26 | null_dep = dependency('', required : false) |
| 27 | |
| 28 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
| 29 | + |
| 30 | # Arguments for the preprocessor, put these in a separate array from the C and |
| 31 | # C++ (cpp in meson terminology) arguments since they need to be added to the |
| 32 | # default arguments for both C and C++. |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 33 | @@ -107,8 +109,6 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
| 34 | # Only build shared_glapi if at least one OpenGL API is enabled |
| 35 | with_shared_glapi = get_option('shared-glapi') and with_any_opengl |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 36 | |
| 37 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) |
| 38 | - |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 39 | dri_drivers = get_option('dri-drivers') |
| 40 | if dri_drivers.contains('auto') |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 41 | if system_has_kms_drm |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 42 | @@ -836,7 +836,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 43 | endif |
| 44 | |
| 45 | # TODO: this is very incomplete |
| 46 | -if ['linux', 'cygwin', 'gnu'].contains(host_machine.system()) |
| 47 | +if ['cygwin', 'gnu'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
| 48 | pre_args += '-D_GNU_SOURCE' |
| 49 | endif |
| 50 | |
| 51 | -- |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 52 | 2.22.0 |
Brad Bishop | 393846f | 2019-05-20 12:24:11 -0400 | [diff] [blame] | 53 | |