From 2c123168dc567c0cb58b2496558acf13dece3a6f Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 8 Sep 2025 07:06:19 +0000
Subject: [PATCH] dev-libs/libaio: Sync with Gentoo

It's from Gentoo commit 5239c4a24c3adaa0c56473f1ad1648c6df5d3804.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
---
 .../dev-libs/libaio/libaio-0.3.113-r1.ebuild           |  2 +-
 .../dev-libs/libaio/libaio-0.3.113_p8.ebuild           | 10 ++++++----
 .../portage-stable/dev-libs/libaio/libaio-9999.ebuild  | 10 ++++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-0.3.113-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-0.3.113-r1.ebuild
index 7c4baa3252..6133e51159 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-0.3.113-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-0.3.113-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
 	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-0.3.113_p8.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-0.3.113_p8.ebuild
index a56b742697..986cf5c317 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-0.3.113_p8.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-0.3.113_p8.ebuild
@@ -68,30 +68,32 @@ multilib_src_configure() {
 	fi
 }
 
-_emake() {
+libaio_emake() {
 	emake \
 		CC="$(tc-getCC)" \
 		AR="$(tc-getAR)" \
 		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS}" \
 		CFLAGS_WERROR= \
+		LDFLAGS="${LDFLAGS}" \
 		prefix="${EPREFIX}/usr" \
 		libdir="${EPREFIX}/usr/$(get_libdir)" \
 		"$@"
 }
 
 multilib_src_compile() {
-	_emake
+	libaio_emake
 }
 
 multilib_src_test() {
 	mkdir -p testdir || die
 
 	# 'make check' breaks with sandbox, 'make partcheck' works
-	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+	libaio_emake -Onone partcheck prefix="${S}/src" libdir="${S}/src"
 }
 
 multilib_src_install() {
-	_emake install DESTDIR="${D}"
+	libaio_emake install DESTDIR="${D}"
 }
 
 multilib_src_install_all() {
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-9999.ebuild
index a56b742697..986cf5c317 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/libaio/libaio-9999.ebuild
@@ -68,30 +68,32 @@ multilib_src_configure() {
 	fi
 }
 
-_emake() {
+libaio_emake() {
 	emake \
 		CC="$(tc-getCC)" \
 		AR="$(tc-getAR)" \
 		RANLIB="$(tc-getRANLIB)" \
+		CFLAGS="${CFLAGS}" \
 		CFLAGS_WERROR= \
+		LDFLAGS="${LDFLAGS}" \
 		prefix="${EPREFIX}/usr" \
 		libdir="${EPREFIX}/usr/$(get_libdir)" \
 		"$@"
 }
 
 multilib_src_compile() {
-	_emake
+	libaio_emake
 }
 
 multilib_src_test() {
 	mkdir -p testdir || die
 
 	# 'make check' breaks with sandbox, 'make partcheck' works
-	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+	libaio_emake -Onone partcheck prefix="${S}/src" libdir="${S}/src"
 }
 
 multilib_src_install() {
-	_emake install DESTDIR="${D}"
+	libaio_emake install DESTDIR="${D}"
 }
 
 multilib_src_install_all() {