Mesa (staging/19.2): meson: recognize "sunos" as the system name for Solaris
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Oct 17 16:29:37 UTC 2019
Module: Mesa
Branch: staging/19.2
Commit: 9b49a4ea12f6c50bd10024312a672783d11a4acd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b49a4ea12f6c50bd10024312a672783d11a4acd
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Oct 7 18:46:41 2019 -0700
meson: recognize "sunos" as the system name for Solaris
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Acked-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
(cherry picked from commit d8a9420f6f1a9eabe6dffe19779de9ec8fba9ab0)
Minor conflicts resolved by Dylan Baker
---
meson.build | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index bcb8fcf8348..d58415270d0 100644
--- a/meson.build
+++ b/meson.build
@@ -117,7 +117,7 @@ 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', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system())
+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
dri_drivers = get_option('dri-drivers')
if dri_drivers.contains('auto')
@@ -858,6 +858,8 @@ endif
# TODO: this is very incomplete
if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system())
pre_args += '-D_GNU_SOURCE'
+elif host_machine.system() == 'sunos'
+ pre_args += '-D__EXTENSIONS__'
endif
# Check for generic C arguments
More information about the mesa-commit
mailing list