From 4b91693ac1615300e4f5081b0b30b17f1e3afbaf Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Fri, 6 Feb 2026 03:56:31 +0200
Subject: [PATCH 26/26] CI: Build clang-debug job with meson

See RM #1776

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .github/workflows/ci.yml |  8 ++------
 scripts/ci-build.sh      | 38 +++++++++++++++++---------------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 413eccea4f..3f83c734be 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -181,6 +181,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get -y install \
+            meson \
             clang \
             libtolua-dev \
             liblua5.4-dev \
@@ -188,10 +189,6 @@ jobs:
             libgtk-3-dev \
             libgtk-4-dev \
             libcurl4-openssl-dev \
-            libtool \
-            automake \
-            autoconf \
-            autotools-dev \
             language-pack-en \
             python3.10 \
             liblzma-dev \
@@ -199,10 +196,9 @@ jobs:
             libsqlite3-dev \
             qt6-base-dev \
             libsdl2-mixer-dev \
-            libsdl2-gfx-dev \
             libsdl2-image-dev \
             libsdl2-ttf-dev \
-            libmysqlclient-dev \
+            libmariadb-dev \
             unixodbc-dev
       - name: build
         shell: bash
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index 4df750a28b..e5dc6a5804 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -116,27 +116,23 @@ echo "Freeciv server autogame successful!"
 # Configure and build Freeciv
 mkdir build
 cd build
-../autogen.sh \
- CC="clang" \
- CXX="clang++" \
- CFLAGS="-Wno-error" \
- --enable-ack-legacy \
- --enable-debug \
- --enable-sys-tolua-cmd \
- --disable-fcdb \
- --with-qtver=qt6 \
- --enable-client=gtk3.22,qt,sdl2,gtk4,stub \
- --enable-fcmp=cli,gtk3,qt,gtk4 \
- --enable-fcdb=sqlite3,mysql,postgres,odbc \
- --enable-freeciv-manual \
- --enable-ai-static=classic,tex,stub \
- --prefix=${HOME}/freeciv/clang \
- || (let config_exit_status=$? \
-     && echo "Config exit status: $config_exit_status" \
-     && cat config.log \
-     && exit $config_exit_status)
-make -s -j$(nproc)
-make install
+
+CC="clang" \
+CXX="clang++" \
+meson setup .. \
+ -Ddebug=true \
+ -Dqtver=qt6 \
+ -Dclients=gtk3.22,gtk4,qt,sdl2,stub \
+ -Dfcmp=gtk3,gtk4,qt,cli \
+ -Dfcdb=sqlite3,mariadb,odbc \
+ -Dprefix=${HOME}/freeciv/clang \
+ || (let meson_exit_status=$? \
+      && echo "meson.log:" \
+      && cat meson-logs/meson-log.txt \
+      && exit ${meson_exit_status})
+ninja
+ninja install
+echo "Freeciv build successful!"
 ;;
 
 tcc)
-- 
2.51.0