From e4222ebd7f2099945fa0d4c364b73859abd4ecf9 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 19 Feb 2024 07:12:21 +0000 Subject: [PATCH] dev-libs/libuv: Sync with Gentoo It's from Gentoo commit 4e9dcf104a547b648b31528563256fc0fe3dbed8. --- .../portage-stable/dev-libs/libuv/Manifest | 4 +- ...-1.48.0-test-thread-priority-portage.patch | 21 ++++++++ .../dev-libs/libuv/libuv-1.46.0.ebuild | 53 ------------------- ...v-1.44.2-r1.ebuild => libuv-1.48.0.ebuild} | 23 +++++--- .../dev-libs/libuv/libuv-9999.ebuild | 21 +++++--- 5 files changed, 54 insertions(+), 68 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libuv/files/libuv-1.48.0-test-thread-priority-portage.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.46.0.ebuild rename sdk_container/src/third_party/portage-stable/dev-libs/libuv/{libuv-1.44.2-r1.ebuild => libuv-1.48.0.ebuild} (55%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest index 5ad67b2526..08d6094e36 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/Manifest @@ -1,3 +1,3 @@ -DIST libuv-1.44.2.tar.gz 1309062 BLAKE2B 883a1fbffcd8f55bf28ea5a79ed18aa3e2f2fac126285e8aca2ef9370eafc62f69f95ddb8bf27d4159e038bfb0a01abafdf0dadbc4309e5d31f0e77057ee84ac SHA512 d21c890787b0b364fafa5fc0cbbff296bc2ca269e1991d2f7f35fcb37b8634da377466f5af5a4245425fcf876ae6870d100ab32b12bce64f8e0b01fd25a1bc83 -DIST libuv-1.46.0.tar.gz 1311065 BLAKE2B fd492b6ca873a08ad4df7561b9d83a09d9bd2cbc10c17265c02982a231edb5c6d71698aecc9a14d455ea230f9e791807f42561d8b3c96e37edb4a709860859b0 SHA512 e3a7c10ffd909f9b128fb2316e09b8456e87278107178b49368f31ba30e7f62d64e7eba650cc59ef2d7eb178199c7a2c5b5c99b333849200492235116d7aee7a DIST libuv-1.47.0.tar.gz 1316016 BLAKE2B 6c530f8625366a9bf3f99ac4eb6b3bf3d4f6a05f98848e08cdab884934d79862cf8e79dd2d506ec734d701faab517eba2215063dce4b4216add5cfd6bfebd82e SHA512 3d0e76c4e29c5de14fddda07409f8db30dc64261d1c0bdfce7f70eb8f5ac911707fe662e81c4f117e4068cb0728158fc2b8255f8aa497c0f688e46c7fb93a5b3 +DIST libuv-1.48.0.tar.gz 1314877 BLAKE2B 7595797ab732109516ce280fa2efa3474e82e78890087408c7f5b1457ce8f44e53878581bb8d473795e298d7390dd8a269dd2e8970e10b50a2c0bbe1cce187cc SHA512 7ae3a4c02f654a26056db1541e52ccc4c54aaea39c33585f0cf6949af997d0a0a29f30a294c8df6e92f6f6af7ce64c2766b1a2cc67f342e3e139cd55b7326c94 +DIST libuv-1.48.0.tar.gz.sig 833 BLAKE2B f0982f7723fa81afe3fe668fc4497fb182a6093f38b185aba4f7359a3248062e7953acaba3f7fd739c9ff5b590664e4b7b81ee138442ffccd46c989c0a10345b SHA512 3a6441bb250badb7bb54a102dd7a1cf47ee4e0ed93ff0369c5b6a4b1e5440e613d85530f19c9ebdc586a97dfe1e06af09e2f90c13448e875dbaee1c703efa955 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/files/libuv-1.48.0-test-thread-priority-portage.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/files/libuv-1.48.0-test-thread-priority-portage.patch new file mode 100644 index 0000000000..6cefebacf2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/files/libuv-1.48.0-test-thread-priority-portage.patch @@ -0,0 +1,21 @@ +This test fails in Portage with aggressive PORTAGE_NICENESS, PORTAGE_IONICE_COMMAND, +and PORTAGE_SCHEDULING_POLICY. + +Bug: https://bugs.gentoo.org/924653 +--- a/test/test-thread-priority.c ++++ b/test/test-thread-priority.c +@@ -92,7 +92,6 @@ TEST_IMPL(thread_priority) { + ASSERT_EQ(priority, 0); + ASSERT_OK(uv_thread_setpriority(pthread_self(), UV_THREAD_PRIORITY_LOWEST)); + ASSERT_OK(uv_thread_getpriority(pthread_self(), &priority)); +- ASSERT_EQ(priority, (0 - UV_THREAD_PRIORITY_LOWEST * 2)); + #endif + + uv_sem_post(&sem); +@@ -102,4 +101,4 @@ TEST_IMPL(thread_priority) { + uv_sem_destroy(&sem); + + return 0; +-} +\ No newline at end of file ++} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.46.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.46.0.ebuild deleted file mode 100644 index c99da814d3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.46.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Cross-platform asychronous I/O" -HOMEPAGE="https://github.com/libuv/libuv" - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/libuv/libuv.git" - inherit git-r3 -else - SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 -hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="BSD BSD-2 ISC MIT" -SLOT="0/1" - -BDEPEND=" - dev-build/libtool - virtual/pkgconfig -" - -src_prepare() { - default - - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - - if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then - eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch - fi - - # Upstream fails to ship a configure script - eautoreconf -} - -src_configure() { - local myeconfargs=( - cc_cv_cflags__g=no - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.48.0.ebuild similarity index 55% rename from sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.48.0.ebuild index 0e54d3d5d9..d1f550d8ed 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.44.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-1.48.0.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit autotools +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libuv.asc +inherit autotools verify-sig DESCRIPTION="Cross-platform asychronous I/O" HOMEPAGE="https://github.com/libuv/libuv" @@ -12,8 +13,12 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/libuv/libuv.git" inherit git-r3 else - SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + SRC_URI=" + https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz -> ${P}.tar.gz + verify-sig? ( https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz.sign -> ${P}.tar.gz.sig ) + " + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + S="${WORKDIR}/${PN}-v${PV}" fi LICENSE="BSD BSD-2 ISC MIT" @@ -22,19 +27,23 @@ SLOT="0/1" BDEPEND=" dev-build/libtool virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-libuv ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.48.0-test-thread-priority-portage.patch +) + src_prepare() { default - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch fi - # Upstream fails to ship a configure script + # Upstream fails to ship a configure script and has missing m4 file. + echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ + > m4/libuv-extra-automake-flags.m4 || die eautoreconf } diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild index 14fe0b49c3..056ed6900a 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libuv/libuv-9999.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit autotools +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libuv.asc +inherit autotools verify-sig DESCRIPTION="Cross-platform asychronous I/O" HOMEPAGE="https://github.com/libuv/libuv" @@ -12,8 +13,12 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/libuv/libuv.git" inherit git-r3 else - SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz -> ${P}.tar.gz + verify-sig? ( https://dist.libuv.org/dist/v${PV}/libuv-v${PV}.tar.gz.sign -> ${P}.tar.gz.sig ) + " KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + S="${WORKDIR}/${PN}-v${PV}" fi LICENSE="BSD BSD-2 ISC MIT" @@ -22,19 +27,23 @@ SLOT="0/1" BDEPEND=" dev-build/libtool virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-libuv ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.48.0-test-thread-priority-portage.patch +) + src_prepare() { default - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - > m4/libuv-extra-automake-flags.m4 || die - if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then eapply "${FILESDIR}"/${PN}-1.41.0-darwin.patch fi - # Upstream fails to ship a configure script + # Upstream fails to ship a configure script and has missing m4 file. + echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ + > m4/libuv-extra-automake-flags.m4 || die eautoreconf }