Mesa (staging/20.0): omx: fix build with gcc 10

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: cfb5679577c5f0f94f4e5852d434e4123a99a24c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfb5679577c5f0f94f4e5852d434e4123a99a24c

Author: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Date:   Thu Mar  5 09:37:58 2020 +0100

omx: fix build with gcc 10

bellagio/omx header files reference a global variable without the
extern keyworkd.
Now that gcc-10 enables the '-fno-common' by default the build fails.
Since these are external headers we can't easily fix them, so for
now build the omx module with the '-fcommon' flag to keep the
previous behavior.

See https://gitlab.freedesktop.org/mesa/mesa/issues/2385

Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4058>
(cherry picked from commit 283e815339a15fa99039c69f1e225269790ae955)
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3019

---

 .pick_status.json                          | 2 +-
 src/gallium/state_trackers/omx/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index de654f63371..98705f33a5d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -34069,7 +34069,7 @@
         "description": "omx: fix build with gcc 10",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build
index 3aa82090c91..987d3e23c84 100644
--- a/src/gallium/state_trackers/omx/meson.build
+++ b/src/gallium/state_trackers/omx/meson.build
@@ -65,7 +65,7 @@ endif
 libomx_st = static_library(
   'omx_st',
   files_omx,
-  c_args : [c_vis_args],
+  c_args : [c_vis_args, '-fcommon'],
   include_directories : inc_st_omx,
   dependencies : dep_st_omx,
 )