From e1e1ef09f9bc7d2ca1f6876f4f4d13268be5a50d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Sep 2025 15:26:25 +0200
Subject: [PATCH 1/2] meson: fail build when encountering unused variables

---
 meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meson.build b/meson.build
index 2e76d44aeb..e95e9d4a79 100644
--- a/meson.build
+++ b/meson.build
@@ -405,6 +405,7 @@ possible_common_cc_flags = [
         '-Werror=shift-overflow=2',
         '-Werror=strict-flex-arrays',
         '-Werror=undef',
+        '-Werror=unused-variable',
         '-Wfloat-equal',
         # gperf prevents us from enabling this because it does not emit fallthrough
         # attribute with clang.

From 5d64216fc28fceda923487310a1a839348528095 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Aug 2025 11:50:39 +0200
Subject: [PATCH 2/2] meson: sort components

---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index e95e9d4a79..b0d22d5a18 100644
--- a/meson.build
+++ b/meson.build
@@ -2365,9 +2365,9 @@ subdir('src/login')
 subdir('src/machine')
 subdir('src/machine-id-setup')
 subdir('src/measure')
-subdir('src/mountfsd')
 subdir('src/modules-load')
 subdir('src/mount')
+subdir('src/mountfsd')
 subdir('src/network')
 subdir('src/notify')
 subdir('src/nspawn')
@@ -2401,6 +2401,7 @@ subdir('src/socket-activate')
 subdir('src/socket-proxy')
 subdir('src/ssh-generator')
 subdir('src/stdio-bridge')
+subdir('src/storagetm')
 subdir('src/sulogin-shell')
 subdir('src/sysctl')
 subdir('src/sysext')
@@ -2409,7 +2410,6 @@ subdir('src/systemctl')
 subdir('src/sysupdate')
 subdir('src/sysusers')
 subdir('src/sysv-generator')
-subdir('src/storagetm')
 subdir('src/timedate')
 subdir('src/timesync')
 subdir('src/tmpfiles')