1 From 283e815339a15fa99039c69f1e225269790ae955 Mon Sep 17 00:00:00 2001
2 From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
3 Date: Thu, 5 Mar 2020 09:37:58 +0100
4 Subject: [PATCH 1/2] omx: fix build with gcc 10
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 bellagio/omx header files reference a global variable without the
11 Now that gcc-10 enables the '-fno-common' by default the build fails.
12 Since these are external headers we can't easily fix them, so for
13 now build the omx module with the '-fcommon' flag to keep the
16 See https://gitlab.freedesktop.org/mesa/mesa/issues/2385
18 Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
19 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4058>
21 src/gallium/state_trackers/omx/meson.build | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
24 diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build
25 index 3aa82090c91..987d3e23c84 100644
26 --- a/src/gallium/state_trackers/omx/meson.build
27 +++ b/src/gallium/state_trackers/omx/meson.build
28 @@ -65,7 +65,7 @@ endif
29 libomx_st = static_library(
32 - c_args : [c_vis_args],
33 + c_args : [c_vis_args, '-fcommon'],
34 include_directories : inc_st_omx,
35 dependencies : dep_st_omx,
41 From 33b255e107b470b8d2ea5bd96d82c613244aaf47 Mon Sep 17 00:00:00 2001
42 From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
43 Date: Thu, 5 Mar 2020 11:00:28 +0100
44 Subject: [PATCH 2/2] meson: enable -fno-common by default
46 Content-Type: text/plain; charset=UTF-8
47 Content-Transfer-Encoding: 8bit
49 This flag is enabled by default starting with gcc 10.
50 All the compilation issues have been fixed, so use it by default
51 to make sure we're not introducing regressions.
53 Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
54 Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4058>
55 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4058>
58 1 file changed, 1 insertion(+)
60 diff --git a/meson.build b/meson.build
61 index 1484e7fec5d..bf306605645 100644
64 @@ -958,6 +958,7 @@ else
70 # MinGW chokes on format specifiers and I can't get it all working
71 if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows')