From 3288149096bdbd105811cca95989657d0c5d65d3 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 21 Jun 2022 16:30:03 -0700
Subject: [PATCH] CI: Use -fcommon to build xtst

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
 .gitlab-ci/debian-install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index e931c6790..26aa26c2f 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -166,7 +166,9 @@ git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1
 
 git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1
 cd xts
-./autogen.sh
+# Using -fcommon until we get a proper fix into xtst.
+# See discussion at https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913
+CFLAGS=-fcommon ./autogen.sh
 xvfb-run make -j${FDO_CI_CONCURRENT:-4}
 cd ..