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 | 37 |
1 files changed, 13 insertions, 24 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 0064dc643c..9fba5da4b2 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,7 +1,7 @@ | |||
1 | From da6b9188f29942684d4262f0c6264d09bb6fe7de Mon Sep 17 00:00:00 2001 | 1 | From ea966884e39aae9571c038fab55f3c1663d17850 Mon Sep 17 00:00:00 2001 |
2 | From: Fabio Berton <fabio.berton@ossystems.com.br> | 2 | From: Fabio Berton <fabio.berton@ossystems.com.br> |
3 | Date: Wed, 12 Jun 2019 13:40:20 -0300 | 3 | Date: Wed, 12 Jun 2019 13:40:20 -0300 |
4 | Subject: [PATCH 1/3] meson.build: check for all linux host_os combinations | 4 | Subject: [PATCH] meson.build: check for all linux host_os combinations |
5 | Organization: O.S. Systems Software LTDA. | 5 | Organization: O.S. Systems Software LTDA. |
6 | 6 | ||
7 | Make sure that we are also looking for our host_os combinations like | 7 | Make sure that we are also looking for our host_os combinations like |
@@ -13,41 +13,30 @@ Upstream-Status: Pending | |||
13 | 13 | ||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | 14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> |
15 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | 15 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> |
16 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
16 | --- | 17 | --- |
17 | meson.build | 6 +++--- | 18 | meson.build | 4 ++-- |
18 | 1 file changed, 3 insertions(+), 3 deletions(-) | 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
19 | 20 | ||
20 | diff --git a/meson.build b/meson.build | 21 | diff --git a/meson.build b/meson.build |
21 | index 8ab8a550f56..e11880f2902 100644 | 22 | index 567a81afd6f..b33b430aed4 100644 |
22 | --- a/meson.build | 23 | --- a/meson.build |
23 | +++ b/meson.build | 24 | +++ b/meson.build |
24 | @@ -34,6 +34,8 @@ cpp = meson.get_compiler('cpp') | 25 | @@ -107,7 +107,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 |
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++. | ||
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 | 26 | # Only build shared_glapi if at least one OpenGL API is enabled |
35 | with_shared_glapi = get_option('shared-glapi') and with_any_opengl | 27 | with_shared_glapi = get_option('shared-glapi') and with_any_opengl |
36 | 28 | ||
37 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly', 'linux'].contains(host_machine.system()) | 29 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system()) |
38 | - | 30 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
31 | |||
39 | dri_drivers = get_option('dri-drivers') | 32 | dri_drivers = get_option('dri-drivers') |
40 | if dri_drivers.contains('auto') | 33 | if dri_drivers.contains('auto') |
41 | if system_has_kms_drm | 34 | @@ -845,7 +845,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', |
42 | @@ -836,7 +836,7 @@ if cc.compiles('int foo(void) __attribute__((__noreturn__));', | ||
43 | endif | 35 | endif |
44 | 36 | ||
45 | # TODO: this is very incomplete | 37 | # TODO: this is very incomplete |
46 | -if ['linux', 'cygwin', 'gnu'].contains(host_machine.system()) | 38 | -if ['linux', 'cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) |
47 | +if ['cygwin', 'gnu'].contains(host_machine.system()) or host_machine.system().startswith('linux') | 39 | +if ['cygwin', 'gnu', 'gnu/kfreebsd'].contains(host_machine.system()) or host_machine.system().startswith('linux') |
48 | pre_args += '-D_GNU_SOURCE' | 40 | pre_args += '-D_GNU_SOURCE' |
49 | endif | 41 | endif |
50 | 42 | ||
51 | -- | ||
52 | 2.22.0 | ||
53 | |||