From c150809c43f4af6c9842d8a051cbb9c21762dfb0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 4 Aug 2025 07:19:32 +0000 Subject: [PATCH] sys-apps/util-linux: Sync with Gentoo It's from Gentoo commit ddb25922124a4e0b58e2a6b1b96b25b9aaf1657b. --- ...til-linux-2.41.1.ebuild => util-linux-2.41.1-r1.ebuild} | 6 ++++++ .../sys-apps/util-linux/util-linux-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/portage-stable/sys-apps/util-linux/{util-linux-2.41.1.ebuild => util-linux-2.41.1-r1.ebuild} (98%) diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.1-r1.ebuild similarity index 98% rename from sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.1.ebuild rename to sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.1-r1.ebuild index 364132e10a..96bcf9e9b2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-2.41.1-r1.ebuild @@ -353,6 +353,12 @@ multilib_src_configure() { src_configure() { append-lfs-flags + + # Workaround for bug #961040 (gcc PR120006) + if tc-is-gcc && [[ $(gcc-major-version) == 15 && $(gcc-minor-version) -lt 2 ]] ; then + append-flags -fno-ipa-pta + fi + multilib-minimal_src_configure } diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild index 90bee97edb..32de7e0bb1 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/util-linux/util-linux-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..14} ) TMPFILES_OPTIONAL=1 -inherit pam python-r1 meson-multilib tmpfiles toolchain-funcs +inherit flag-o-matic pam python-r1 meson-multilib tmpfiles toolchain-funcs MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -128,6 +128,11 @@ src_unpack() { src_prepare() { default + # Workaround for bug #961040 (gcc PR120006) + if tc-is-gcc && [[ $(gcc-major-version) == 15 && $(gcc-minor-version) -lt 2 ]] ; then + append-flags -fno-ipa-pta + fi + if use test ; then # Known-failing tests local known_failing_tests=(