From 05f9e96a703154a6ebc37fd7bd4c156db7c5a0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Van=C4=9Bk?= Date: Thu, 28 Aug 2025 11:18:36 +0200 Subject: [PATCH] sys-fs/xfsprogs: fix STATX__RESERVED musl build issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Define STATX__RESERVED manually, similarly to how Alpine Linux [1] solves the issue, as it was pointed out in [2]. Link: https://gitlab.alpinelinux.org/alpine/aports/-/blob/8ff6aa1e459a75b66375f56269fce43ca2c2f9bf/main/xfsprogs/APKBUILD#L27 [1] Link: https://lore.kernel.org/linux-xfs/20250809-musl-fixes-v1-0-d0958fffb1af@nixdorf.dev/ [2] Closes: https://bugs.gentoo.org/960632 Signed-off-by: Petr Vaněk --- sys-fs/xfsprogs/xfsprogs-6.15.0.ebuild | 5 +++-- sys-fs/xfsprogs/xfsprogs-6.16.0.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys-fs/xfsprogs/xfsprogs-6.15.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.15.0.ebuild index 0df7b2a15b66..02d9ee247c31 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.15.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.15.0.ebuild @@ -58,9 +58,10 @@ src_configure() { # Avoid automagic on libdevmapper (bug #709694) export ac_cv_search_dm_task_create=no - # bug 903611, 948468 + # bug 903611, 948468, 960632 use elibc_musl && \ - append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX + append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX \ + -DSTATX__RESERVED=0x80000000U # Upstream does NOT support --disable-static anymore, # https://www.spinics.net/lists/linux-xfs/msg30185.html diff --git a/sys-fs/xfsprogs/xfsprogs-6.16.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.16.0.ebuild index 242f01cf31a1..a7bdebcbf2e3 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.16.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.16.0.ebuild @@ -58,9 +58,10 @@ src_configure() { # Avoid automagic on libdevmapper (bug #709694) export ac_cv_search_dm_task_create=no - # bug 903611, 948468 + # bug 903611, 948468, 960632 use elibc_musl && \ - append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX + append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX \ + -DSTATX__RESERVED=0x80000000U # Upstream does NOT support --disable-static anymore, # https://www.spinics.net/lists/linux-xfs/msg30185.html