commit:     05f9e96a703154a6ebc37fd7bd4c156db7c5a0fe
Author:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 28 09:18:36 2025 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Thu Aug 28 09:29:59 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f9e96a

sys-fs/xfsprogs: fix STATX__RESERVED musl build issue

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 
<AT> nixdorf.dev/ [2]
Closes: https://bugs.gentoo.org/960632
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 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

Reply via email to