From f6d124d7dcf1d5e889fa6ed93e227bc4e3d0fb21 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 16 Jun 2025 07:14:46 +0000 Subject: [PATCH] sys-libs/liburing: Sync with Gentoo It's from Gentoo commit 698144dc08b869569fe1fbd69e87b3c8279b3d7e. --- .../portage-stable/sys-libs/liburing/Manifest | 5 +++-- ...liburing-2.8.ebuild => liburing-2.10-r1.ebuild} | 14 ++++++++++++-- .../sys-libs/liburing/liburing-2.7-r1.ebuild | 7 +++++-- .../sys-libs/liburing/liburing-2.9.ebuild | 2 +- .../sys-libs/liburing/liburing-9999.ebuild | 10 +++++++--- 5 files changed, 28 insertions(+), 10 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-libs/liburing/{liburing-2.8.ebuild => liburing-2.10-r1.ebuild} (82%) diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/Manifest index 713ec40661..3b6ad8ddce 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/Manifest @@ -1,3 +1,4 @@ -DIST liburing-2.7.tar.bz2 252289 BLAKE2B dc04745d2eda04d7009a532fc77566804c34b77dcef512f17ef424e22bc1e1a31ba87c2a841bb5574b11c494641a3128005d6dfccf2b87d6c3888fe5cd887996 SHA512 ec6cf69cae2e7e448e9e338bcd616bf27522f6f0e4768bf80d246d6df8610df3accaddae1c135c31bca7814bc3b8214854c40b3f7137163c0950605c716793f1 -DIST liburing-2.8.tar.bz2 284202 BLAKE2B de1deaa8927b5f80a38195ef857fdb0d3dc5f7f57358fe319af42ec3d980bf4c20284d7726645e9c32bcb3e5d7d981540a52a35abb26394cbef03f88ab7c4248 SHA512 5822108aa771a34a4c3f008a0155e4f1fa9393499f24a1bce00aed7fab6e3b9e022b44f96479af0036295129db75d5062618fb4c48cef836e3155c604491e94d +DIST liburing-2.10-fix-compilation-error-io_uring_for_each_cqe.patch 2593 BLAKE2B cf34ff93859c489a524c9587a1868df27ce4f0b9f19aa8cb0b94c48a5addad5afa3d9469894962652dffcf2228830d4b8547f03220e9c7aa6b20d2a1ca7e9159 SHA512 93d68779cb10b4552306f715a723be92b2acbd9559acef75156b072460b72ccb94e2b06988f1b00745cf7247e886e242d6ebe39a31bff9fad67af80d95ab8fe0 +DIST liburing-2.10.tar.gz 428315 BLAKE2B f5477f7a1a30202feea3e97f236f6a8a2db59923a0ba9c13dda2cd8de0831bb0979dc6acdef4a2f1797ce2637125def54b9f3d50f14ef01affeed43b089228df SHA512 6fb6e7ce66917d9438095e05916f90d834034ac3f6d6d8b6ee1eadf48ab9e499efa4af489dc72f8acc4a0b018f917ffcb8af4af682b47512566205519dd1f5db +DIST liburing-2.7.gh.tar.gz 347638 BLAKE2B 3e281cbf9be72cc8e04b04486df4dd9dd32c95ef9b84f7eae3253eb8e9a4afdaf8048ac359d6d250fecfb0a2bded51e46c1ab073d0e96c4d7d5d1d554d65c2b2 SHA512 c65146ee53defba4f9b752674be8489757f60be0855b361c6d1136119c74803351e5ccc8a1890c0777bfe61da4c0fd997230fc8817ff3929a7e2186b389cdc28 DIST liburing-2.9.tar.gz 407191 BLAKE2B 7081f9430e9532cad659e24de7ba998ad40f15a3fc3bf08fbe2b30df2bb335d4b06affb98d5667d4f8e6c8bc6e7a98c25caddd57ec5c98940562eb0e7977e54d SHA512 f27233e6128444175b18cd1d45647acdd27b906a8cd561029508710e443b44416b916cad1b2c1217e23d9a5ffb5ba68b119e9c812eae406650fbd10bf26c2fa5 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.8.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.10-r1.ebuild similarity index 82% rename from sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.8.ebuild rename to sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.10-r1.ebuild index a469ca0ee1..b64277e202 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.8.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.10-r1.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 @@ -11,10 +11,16 @@ if [[ "${PV}" == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/axboe/liburing.git" else - SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2" + SRC_URI=" + https://github.com/axboe/liburing/archive/refs/tags/${P}.tar.gz + https://github.com/axboe/liburing/commit/6836160ae6ae9fdc20d703de55162bfc97169542.patch + -> ${PN}-2.10-fix-compilation-error-io_uring_for_each_cqe.patch + " KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" QA_PKGCONFIG_VERSION=${PV} fi + +S="${WORKDIR}"/liburing-${P} LICENSE="MIT" SLOT="0/2" # liburing.so major version @@ -26,6 +32,10 @@ RESTRICT="!test? ( test )" DEPEND=">=sys-kernel/linux-headers-5.1" RDEPEND="${DEPEND}" +PATCHES=( + "${DISTDIR}"/${PN}-2.10-fix-compilation-error-io_uring_for_each_cqe.patch +) + src_prepare() { default diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.7-r1.ebuild index d309a7e8cf..b155d151a7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.7-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.7-r1.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 @@ -11,10 +11,13 @@ if [[ "${PV}" == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/axboe/liburing.git" else - SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2" + SRC_URI="https://github.com/axboe/liburing/archive/refs/tags/${P}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" QA_PKGCONFIG_VERSION=${PV} + + S="${WORKDIR}"/liburing-${P} fi + LICENSE="MIT" SLOT="0/2" # liburing.so major version diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.9.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.9.ebuild index 51789caff4..677f999300 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.9.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-2.9.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then EGIT_REPO_URI="https://github.com/axboe/liburing.git" else SRC_URI="https://github.com/axboe/liburing/archive/refs/tags/${P}.tar.gz" - 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" QA_PKGCONFIG_VERSION=${PV} fi diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-9999.ebuild index 76c4d774ef..98c17b11a9 100644 --- a/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-libs/liburing/liburing-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,10 +11,13 @@ if [[ "${PV}" == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/axboe/liburing.git" else - SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + SRC_URI="https://github.com/axboe/liburing/archive/refs/tags/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" QA_PKGCONFIG_VERSION=${PV} + + S="${WORKDIR}"/liburing-${P} fi + LICENSE="MIT" SLOT="0/2" # liburing.so major version @@ -47,6 +50,7 @@ multilib_src_configure() { --mandir="${EPREFIX}/usr/share/man" --cc="$(tc-getCC)" --cxx="$(tc-getCXX)" + --use-libc ) # No autotools configure! "econf" will fail. TMPDIR="${T}" ./configure "${myconf[@]}" || die