From 2cad3498184814ea5a71f1d3325a6fb2db58fa50 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 14 Mar 2026 16:31:18 -0700 Subject: [PATCH] CI: update to libX11 1.8.2 & drop -fcommon workaround in cross-prereqs-build xorg/lib/libx11@487e9489d1e086cc62c53045206ab6d6d9d02031 fixed the libX11 build to work with -fno-common (the new gcc default) Signed-off-by: Alan Coopersmith Part-of: --- .gitlab-ci/cross-prereqs-build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh index 6c7091d78..fd37d18a6 100755 --- a/.gitlab-ci/cross-prereqs-build.sh +++ b/.gitlab-ci/cross-prereqs-build.sh @@ -56,9 +56,7 @@ build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'libxcb-1.14' build 'https://gitlab.freedesktop.org/xorg/lib/libxtrans.git' 'xtrans-1.4.0' # the default value of keysymdefdir is taken from the includedir variable for # xproto, which isn't adjusted by pkg-config for the sysroot -# Using -fcommon to address build failure when cross-compiling for windows. -# See discussion at https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/913 -CFLAGS="-fcommon" build 'https://gitlab.freedesktop.org/xorg/lib/libX11.git' 'libX11-1.6.9' "--with-keysymdefdir=/usr/${HOST}/include/X11" +build 'https://gitlab.freedesktop.org/xorg/lib/libX11.git' 'libX11-1.8.2' "--with-keysymdefdir=/usr/${HOST}/include/X11" build 'https://gitlab.freedesktop.org/xorg/lib/libxkbfile.git' 'libxkbfile-1.1.0' # freetype needs an explicit --build to know it's cross-compiling # disable png as freetype tries to use libpng-config, even when cross-compiling