From f61cf5a67bb91c9aaee1354331ed68578295c212 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Wed, 1 Dec 2021 21:03:40 +0100 Subject: sys-libs/liburing: Removed old Signed-off-by: Lars Wendler --- sys-libs/liburing/Manifest | 2 - .../files/liburing-0.7-ucontext_h-detection.patch | 72 ---------------------- .../liburing/files/liburing-2.0-spec_version.patch | 29 --------- sys-libs/liburing/liburing-0.7-r1.ebuild | 59 ------------------ sys-libs/liburing/liburing-2.0-r1.ebuild | 59 ------------------ 5 files changed, 221 deletions(-) delete mode 100644 sys-libs/liburing/files/liburing-0.7-ucontext_h-detection.patch delete mode 100644 sys-libs/liburing/files/liburing-2.0-spec_version.patch delete mode 100644 sys-libs/liburing/liburing-0.7-r1.ebuild delete mode 100644 sys-libs/liburing/liburing-2.0-r1.ebuild diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest index 274dba180608..397baaaf055a 100644 --- a/sys-libs/liburing/Manifest +++ b/sys-libs/liburing/Manifest @@ -1,3 +1 @@ -DIST liburing-0.7.tar.bz2 86386 BLAKE2B a4fa00cc8e384f9909f3c628d479774beaffd5ab09c9f321ef22bfbabd273e4c8d4dbb30a3280633e89e1a79e893348e68f0aa2f3b1b4deda56759f77d9b1875 SHA512 9a23bc08e0fa59273264295859dddbe3276b2911df6d937b3c6f7647a250a3175222b5f051f3094efc98e48cacd242511327c5c5b895ebde10c8c87929ba4328 -DIST liburing-2.0.tar.bz2 109066 BLAKE2B e2be57f66d2a40650c74502bef55e646986443450b2cdf4d2b5247a3fa099178ae19e61a20e4452dc723351053b613a96743f1268004939da9fddd8f38df3fa5 SHA512 a0da3472eb876c9cfbe56abe14b4d926e4d1c362ee9c4f38eec4c4ab01edab6d76651ffe2afe5cac8589caadc02517950974332eb7990f8bcc9f4f4800b66e33 DIST liburing-2.1.tar.bz2 120806 BLAKE2B 3a09d1504150ed1c111f064187d868fd86ec7c3dbf661f73999f7fbb9c945b528f7ab2e0cfff5d270a1a977f04deedc7c790b6df8708ef2884fbf28c1a9ffd1b SHA512 a658454869b01752b5e499c4f0b50c342a8ff63b3dd1a473a96f9fad03f22a6e4d2354b0e658a4e7e50ea27440a84ee274856b3687803583bc80cb4bc45aec71 diff --git a/sys-libs/liburing/files/liburing-0.7-ucontext_h-detection.patch b/sys-libs/liburing/files/liburing-0.7-ucontext_h-detection.patch deleted file mode 100644 index 24b847d919df..000000000000 --- a/sys-libs/liburing/files/liburing-0.7-ucontext_h-detection.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 1cf969dfcba797a02d74540965677b92d3884cfa Mon Sep 17 00:00:00 2001 -From: Simon Zeni -Date: Tue, 27 Oct 2020 22:31:21 -0400 -Subject: [PATCH] examples: disable ucontext-cp if ucontext.h is not available - -The header file `ucontext.h` is not available on musl based distros. The -example `ucontext-cp` is not built if `configure` fails to locate the -header. - -Signed-off-by: Simon Zeni -Signed-off-by: Jens Axboe ---- - configure | 21 +++++++++++++++++++++ - examples/Makefile | 6 +++++- - 2 files changed, 26 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index c911f59..3b96cde 100755 ---- a/configure -+++ b/configure -@@ -287,6 +287,24 @@ if compile_prog_cxx "" "" "C++"; then - fi - print_config "C++" "$has_cxx" - -+########################################## -+# check for ucontext support -+has_ucontext="no" -+cat > $TMPC << EOF -+#include -+int main(int argc, char **argv) -+{ -+ ucontext_t ctx; -+ getcontext(&ctx); -+ return 0; -+} -+EOF -+if compile_prog "" "" "has_ucontext"; then -+ has_ucontext="yes" -+fi -+print_config "has_ucontext" "$has_ucontext" -+ -+ - ############################################################################# - - if test "$__kernel_rwf_t" = "yes"; then -@@ -304,6 +322,9 @@ fi - if test "$has_cxx" = "yes"; then - output_sym "CONFIG_HAVE_CXX" - fi -+if test "$has_ucontext" = "yes"; then -+ output_sym "CONFIG_HAVE_UCONTEXT" -+fi - - echo "CC=$cc" >> $config_host_mak - print_config "CC" "$cc" -diff --git a/examples/Makefile b/examples/Makefile -index 0eec627..60c1b71 100644 ---- a/examples/Makefile -+++ b/examples/Makefile -@@ -10,7 +10,11 @@ ifneq ($(MAKECMDGOALS),clean) - include ../config-host.mak - endif - --all_targets += io_uring-test io_uring-cp link-cp ucontext-cp -+all_targets += io_uring-test io_uring-cp link-cp -+ -+ifdef CONFIG_HAVE_UCONTEXT -+all_targets += ucontext-cp -+endif - - all: $(all_targets) - diff --git a/sys-libs/liburing/files/liburing-2.0-spec_version.patch b/sys-libs/liburing/files/liburing-2.0-spec_version.patch deleted file mode 100644 index fab05916c366..000000000000 --- a/sys-libs/liburing/files/liburing-2.0-spec_version.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1815337f7dbb530ae3e3bc1175d8da214cf76eb5 Mon Sep 17 00:00:00 2001 -From: Stefan Hajnoczi -Date: Tue, 9 Mar 2021 14:19:12 +0000 -Subject: [PATCH] spec: bump version to 2.0 - -The shared library is now liburing.so.2 but the pkgconfig and rpm files -still say 0.7. Existing binaries link against liburing.so.1 and will not -automatically pick up the new liburing.so.2 shared library. - -Update the version number in liburing.spec so - -Signed-off-by: Stefan Hajnoczi -Link: https://lore.kernel.org/r/20210309141913.262131-2-stefanha@redhat.com -Signed-off-by: Jens Axboe ---- - liburing.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/liburing.spec b/liburing.spec -index fa4d9704..8607074c 100644 ---- a/liburing.spec -+++ b/liburing.spec -@@ -1,5 +1,5 @@ - Name: liburing --Version: 0.7 -+Version: 2.0 - Release: 1%{?dist} - Summary: Linux-native io_uring I/O access library - License: (GPLv2 with exceptions and LGPLv2+) or MIT diff --git a/sys-libs/liburing/liburing-0.7-r1.ebuild b/sys-libs/liburing/liburing-0.7-r1.ebuild deleted file mode 100644 index 715212503eba..000000000000 --- a/sys-libs/liburing/liburing-0.7-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs - -DESCRIPTION="Efficient I/O with io_uring" -HOMEPAGE="https://github.com/axboe/liburing" -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 ~ia64 ppc ppc64 sparc x86" -fi -LICENSE="MIT" -SLOT="0/1.0.7" # liburing.so version - -IUSE="static-libs" -# fsync test hangs forever -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-0.7-ucontext_h-detection.patch -) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - --libdevdir="${EPREFIX}/usr/$(get_libdir)" - --mandir="${EPREFIX}/usr/share/man" - --cc="$(tc-getCC)" - ) - # No autotools configure! "econf" will fail. - TMPDIR="${T}" ./configure "${myconf[@]}" -} - -multilib_src_compile() { - emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs ; then - find "${ED}" -type f -name "*.a" -delete || die - fi -} - -multilib_src_test() { - emake V=1 runtests -} diff --git a/sys-libs/liburing/liburing-2.0-r1.ebuild b/sys-libs/liburing/liburing-2.0-r1.ebuild deleted file mode 100644 index 652b4092a8b2..000000000000 --- a/sys-libs/liburing/liburing-2.0-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs - -DESCRIPTION="Efficient I/O with io_uring" -HOMEPAGE="https://github.com/axboe/liburing" -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 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi -LICENSE="MIT" -SLOT="0/2.0.0" # liburing.so version - -IUSE="static-libs" -# fsync test hangs forever -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${P}-spec_version.patch" #809095 -) - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_configure() { - local myconf=( - --prefix="${EPREFIX}/usr" - --libdir="${EPREFIX}/usr/$(get_libdir)" - --libdevdir="${EPREFIX}/usr/$(get_libdir)" - --mandir="${EPREFIX}/usr/share/man" - --cc="$(tc-getCC)" - ) - # No autotools configure! "econf" will fail. - TMPDIR="${T}" ./configure "${myconf[@]}" -} - -multilib_src_compile() { - emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -} - -multilib_src_install_all() { - einstalldocs - - if ! use static-libs ; then - find "${ED}" -type f -name "*.a" -delete || die - fi -} - -multilib_src_test() { - emake V=1 runtests -} -- cgit v1.2.3-65-gdbad