diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch index 085254323c..7be7d81eeb 100644 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0d9ed002eff176b902da266d89829a9b0cb10946 Mon Sep 17 00:00:00 2001 | 1 | From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001 |
2 | From: Alistair Francis <alistair@alistair23.me> | 2 | From: Alistair Francis <alistair@alistair23.me> |
3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 | 3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 |
4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | 4 | Subject: [PATCH] meson.build: check for all linux host_os combinations |
@@ -14,30 +14,29 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
14 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | 14 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
16 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | 16 | Signed-off-by: Alistair Francis <alistair@alistair23.me> |
17 | |||
18 | --- | 17 | --- |
19 | meson.build | 4 ++-- | 18 | meson.build | 4 ++-- |
20 | 1 file changed, 2 insertions(+), 2 deletions(-) | 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
21 | 20 | ||
22 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
23 | index 898d025..09e3759 100644 | 22 | index 133fd9a..817861e 100644 |
24 | --- a/meson.build | 23 | --- a/meson.build |
25 | +++ b/meson.build | 24 | +++ b/meson.build |
26 | @@ -124,7 +124,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 | 25 | @@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
27 | # Only build shared_glapi if at least one OpenGL API is enabled | 26 | # Only build shared_glapi if at least one OpenGL API is enabled |
28 | with_shared_glapi = with_shared_glapi and with_any_opengl | 27 | with_shared_glapi = with_shared_glapi and with_any_opengl |
29 | 28 | ||
30 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) | 29 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) |
31 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') | 30 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
32 | 31 | ||
33 | dri_drivers = get_option('dri-drivers') | 32 | gallium_drivers = get_option('gallium-drivers') |
34 | if dri_drivers.contains('auto') | 33 | if gallium_drivers.contains('auto') |
35 | @@ -884,7 +884,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }', | 34 | @@ -997,7 +997,7 @@ if cc.has_function('fmemopen') |
36 | endif | 35 | endif |
37 | 36 | ||
38 | # TODO: this is very incomplete | 37 | # TODO: this is very incomplete |
39 | -if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd'].contains(host_machine.system()) | 38 | -if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) |
40 | +if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux') | 39 | +if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
41 | pre_args += '-D_GNU_SOURCE' | 40 | pre_args += '-D_GNU_SOURCE' |
42 | elif host_machine.system() == 'sunos' | 41 | elif host_machine.system() == 'sunos' |
43 | pre_args += '-D__EXTENSIONS__' | 42 | pre_args += '-D__EXTENSIONS__' |