From 1ef3ffb20aa83b3d80eddcdd433aafbef6fe12d8 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Mar 2025 07:12:01 +0000 Subject: [PATCH] sys-fs/xfsprogs: Sync with Gentoo It's from Gentoo commit f13e7f7a3607cfaf8e2e71efd3da4759e7e2facb. --- .../sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild | 5 +---- .../sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild | 10 ++++------ .../sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild | 8 +++----- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild index 118c09e2c9..eebeded6b0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -58,9 +58,6 @@ src_configure() { # bug 903611 use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 - # Upstream does NOT support --disable-static anymore, # https://www.spinics.net/lists/linux-xfs/msg30185.html # https://www.spinics.net/lists/linux-xfs/msg30272.html diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild index d7ac475a1d..1f70ea3e72 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.12.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="icu libedit nls selinux static-libs" RDEPEND=" @@ -58,11 +58,9 @@ src_configure() { # Avoid automagic on libdevmapper (bug #709694) export ac_cv_search_dm_task_create=no - # bug 903611 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 + # bug 903611, 948468 + use elibc_musl && \ + append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX # Upstream does NOT support --disable-static anymore, # https://www.spinics.net/lists/linux-xfs/msg30185.html diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild index f2dfa068fb..b495f342e0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-fs/xfsprogs/xfsprogs-6.13.0-r1.ebuild @@ -62,11 +62,9 @@ src_configure() { # Avoid automagic on libdevmapper (bug #709694) export ac_cv_search_dm_task_create=no - # bug 903611 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 + # bug 903611, 948468 + use elibc_musl && \ + append-flags -D_LARGEFILE64_SOURCE -DOVERRIDE_SYSTEM_STATX # Upstream does NOT support --disable-static anymore, # https://www.spinics.net/lists/linux-xfs/msg30185.html