From da6b9188f29942684d4262f0c6264d09bb6fe7de Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Wed, 12 Jun 2019 13:40:20 -0300 Subject: [PATCH 1/3] meson.build: check for all linux host_os combinations Organization: O.S. Systems Software LTDA. 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 Signed-off-by: Fabio Berton --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 8ab8a550f56..e11880f2902 100644 --- a/meson.build +++ b/meson.build @@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp') null_dep = dependency('', required : false) +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') + # Arguments for the preprocessor, put these in a separate array from the C and # C++ (cpp in meson terminology) arguments since they need to be added to the # default arguments for both C and C++. @@ -107,8 +109,6 @@ 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 = get_option('shared-glapi') and with_any_opengl -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) - dri_drivers = get_option('dri-drivers') if dri_drivers.contains('auto') if system_has_kms_drm @@ -836,7 +836,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', endif # TODO: this is very incomplete -if ['linux', 'cygwin', 'gnu'].contains(host_machine.system()) +if ['cygwin', 'gnu'].contains(host_machine.system()) or host_machine.system().startswith('linux') pre_args += '-D_GNU_SOURCE' endif -- 2.22.0