commit: ed24d1a828cf19ceb6788c0caf38ce0ffb4fd96b Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Sep 18 10:13:30 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Sep 18 10:30:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed24d1a8
dev-libs/libaio: Removed old Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> dev-libs/libaio/Manifest | 2 - dev-libs/libaio/files/libaio-0.3.109-install.patch | 45 ----------- .../libaio/files/libaio-0.3.109-testcase-8.patch | 19 ----- dev-libs/libaio/files/libaio-0.3.109-x32.patch | 63 ---------------- .../libaio/files/libaio-0.3.110-cppflags.patch | 25 ------ .../libaio/files/libaio-0.3.110-link-stdlib.patch | 21 ------ .../files/libaio-0.3.110-optional-werror.patch | 30 -------- dev-libs/libaio/libaio-0.3.110.ebuild | 83 -------------------- dev-libs/libaio/libaio-0.3.111.ebuild | 88 ---------------------- 9 files changed, 376 deletions(-) diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest index 9fdec3bf4ca..e956615f88e 100644 --- a/dev-libs/libaio/Manifest +++ b/dev-libs/libaio/Manifest @@ -1,3 +1 @@ -DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3 -DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa diff --git a/dev-libs/libaio/files/libaio-0.3.109-install.patch b/dev-libs/libaio/files/libaio-0.3.109-install.patch deleted file mode 100644 index 9c049fcbf5c..00000000000 --- a/dev-libs/libaio/files/libaio-0.3.109-install.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2e34caef82a2367a85de4f06daf5e5a92f61e845 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Sun, 17 Jan 2010 17:10:14 -0500 -Subject: [PATCH] fix up install paths - -This is similar to the Fedora patch, but this uses more common conventions -like "DESTDIR" instead of "destdir". - -Signed-off-by: Mike Frysinger <[email protected]> ---- - src/Makefile | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 687c7be..ee431a1 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -1,6 +1,7 @@ - prefix=/usr - includedir=$(prefix)/include - libdir=$(prefix)/lib -+usrlibdir=$(libdir) - - CFLAGS ?= -g -fomit-frame-pointer -O2 - CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -@@ -53,11 +54,11 @@ $(libname): $(libaio_sobjs) libaio.map - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname,$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) - - install: $(all_targets) -- install -D -m 644 libaio.h $(includedir)/libaio.h -- install -D -m 644 libaio.a $(libdir)/libaio.a -- install -D -m 755 $(libname) $(libdir)/$(libname) -- ln -sf $(libname) $(libdir)/$(soname) -- ln -sf $(libname) $(libdir)/libaio.so -+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h -+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a -+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) -+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname) -+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so - - $(libaio_objs): libaio.h - --- -1.7.3.1 - diff --git a/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch b/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch deleted file mode 100644 index de66f2110f2..00000000000 --- a/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch +++ /dev/null @@ -1,19 +0,0 @@ -Do not ignore return value of ftruncate(): testcases are compiled with -Werror, -and ftruncate is declared with attribute warn_unused_result. ---- harness/cases/8.t.orig 2012-03-09 16:40:04.074168070 +0100 -+++ harness/cases/8.t 2012-03-09 16:40:57.777278646 +0100 -@@ -9,12 +9,13 @@ - { - long long min = 0, max = 9223372036854775807LL; - char c = 0; -+ int ret; - - while (max - min > 1) { - if (pwrite64(fd, &c, 1, (min + max) / 2) == -1) - max = (min + max) / 2; - else { -- ftruncate(fd, 0); -+ ret = ftruncate(fd, 0); assert(ret == 0); - min = (min + max) / 2; - } - } diff --git a/dev-libs/libaio/files/libaio-0.3.109-x32.patch b/dev-libs/libaio/files/libaio-0.3.109-x32.patch deleted file mode 100644 index 1d2c2a9050f..00000000000 --- a/dev-libs/libaio/files/libaio-0.3.109-x32.patch +++ /dev/null @@ -1,63 +0,0 @@ -http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f5c071d93c9e6f57930bce56b1e4f009c160a826 - -Upstream-Status: Pending - -Properly load arguments 5 an 6 for x86-64 syscall -Use asm ("r10") and asm ("r8") to load arguments 5 an 6 for x86-64 -syscall so that it works with both x32 and x86-64. - -Received this patch from H.J. Lu <[email protected]> - -Signed-Off-By: Nitin A Kamble <[email protected]> -2011/12/02 - ---- libaio-0.3.109/src/syscall-x86_64.h.x32 2009-10-09 11:17:02.000000000 -0700 -+++ libaio-0.3.109/src/syscall-x86_64.h 2011-12-02 09:09:07.537603224 -0800 -@@ -1,8 +1,18 @@ -+#ifndef __NR_io_setup - #define __NR_io_setup 206 -+#endif -+#ifndef __NR_io_destroy - #define __NR_io_destroy 207 -+#endif -+#ifndef __NR_io_getevents - #define __NR_io_getevents 208 -+#endif -+#ifndef __NR_io_submit - #define __NR_io_submit 209 -+#endif -+#ifndef __NR_io_cancel - #define __NR_io_cancel 210 -+#endif - - #define __syscall_clobber "r11","rcx","memory" - #define __syscall "syscall" -@@ -42,10 +52,11 @@ return __res; \ - type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ - { \ - long __res; \ --__asm__ volatile ("movq %5,%%r10 ;" __syscall \ -+register long __a4 asm ("r10") = (long) arg4; \ -+__asm__ volatile (__syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ -- "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \ -+ "d" ((long)(arg3)),"r" (__a4)); \ - return __res; \ - } - -@@ -54,10 +65,11 @@ return __res; \ - type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ - { \ - long __res; \ --__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \ -+register long __a4 asm ("r10") = (long) arg4; \ -+register long __a5 asm ("r8") = (long) arg5; \ -+__asm__ volatile ( __syscall \ - : "=a" (__res) \ - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \ -- "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \ -- __syscall_clobber,"r8","r10" ); \ -+ "d" ((long)(arg3)),"r" (__a4),"r" (__a5)); \ - return __res; \ - } diff --git a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch deleted file mode 100644 index 4567ac94668..00000000000 --- a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3bf96bb62370035dba18d4b25459406b32365cfc Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Wed, 26 Mar 2014 23:10:18 -0400 -Subject: [PATCH] respect env CPPFLAGS - -Signed-off-by: Mike Frysinger <[email protected]> ---- - src/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile b/src/Makefile -index 49f448f..b918c8b 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -5,6 +5,7 @@ usrlibdir=$(libdir) - - CFLAGS ?= -g -fomit-frame-pointer -O2 - CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+CFLAGS += $(CPPFLAGS) - SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) - LINK_FLAGS= --- -1.9.1 - diff --git a/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch b/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch deleted file mode 100644 index 696a928f24d..00000000000 --- a/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gokturk Yuksek <[email protected]> -Subject: [PATCH] Link against stdlib to resolve fortified functions - -When '-fstack-protector-strong' is included in CFLAGS, the function -'__stack_chk_fail_local' needs to be pulled from libc. However, upstream -uses '-nostdlib' to avoid linking against any C library or gcc libs. Remove -'-nostdlib' and '-nostartfiles' to pull the required symbols from libc. - -Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558406 - ---- a/src/Makefile -+++ b/src/Makefile -@@ -4,7 +4,7 @@ - usrlibdir=$(libdir) - - CFLAGS ?= -g -fomit-frame-pointer -O2 --CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+CFLAGS += -Wall -I. -fPIC - CFLAGS += $(CPPFLAGS) - SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) diff --git a/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch deleted file mode 100644 index 2933cf5244b..00000000000 --- a/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0cc7dc108d0b2288b40d82bb2fd1fd8bdc08f764 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Wed, 26 Mar 2014 23:07:58 -0400 -Subject: [PATCH] make -Werror into an optional flag - -This lets distros disable the flag as random errors might come up with -different compiler flags and older/newer toolchain versions. - -Signed-off-by: Mike Frysinger <[email protected]> ---- - harness/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/harness/Makefile b/harness/Makefile -index 2a88e71..cf8c90d 100644 ---- a/harness/Makefile -+++ b/harness/Makefile -@@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS) - HARNESS_SRCS:=main.c - # io_queue.c - --CFLAGS+=-Wall -Werror -I../src -g -O -+CFLAGS_WERROR?=-Werror -+CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O - #-lpthread -lrt - - all: $(PROGS) --- -1.9.1 - diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.110.ebuild deleted file mode 100644 index 0fc7844e269..00000000000 --- a/dev-libs/libaio/libaio-0.3.110.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib-minimal toolchain-funcs flag-o-matic usr-ldscript - -DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" -HOMEPAGE="http://lse.sourceforge.net/io/aio.html"; -SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-0.3.109-install.patch \ - "${FILESDIR}"/${PN}-0.3.109-x32.patch \ - "${FILESDIR}"/${PN}-0.3.109-testcase-8.patch \ - "${FILESDIR}"/${PN}-0.3.110-cppflags.patch \ - "${FILESDIR}"/${PN}-0.3.110-optional-werror.patch \ - "${FILESDIR}"/${PN}-0.3.110-link-stdlib.patch #558406 - - local sed_args=( - -e "/^prefix=/s:/usr:${EPREFIX}/usr:" - -e '/^libdir=/s:lib$:$(ABI_LIBDIR):' - ) - if ! use static-libs; then - sed_args+=( -e '/\tinstall .*\/libaio.a/d' ) - # Tests require the static library to be built. - use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' ) - fi - sed -i "${sed_args[@]}" src/Makefile Makefile || die - - multilib_copy_sources -} - -multilib_src_configure() { - if use arm ; then - # When building for thumb, we can't allow frame pointers. - # http://crbug.com/464517 - if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then - append-flags -fomit-frame-pointer - fi - fi -} - -_emake() { - CC=$(tc-getCC) \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) \ - ABI_LIBDIR=$(get_libdir) \ - CFLAGS_WERROR= \ - emake "$@" -} - -multilib_src_compile() { - _emake -} - -multilib_src_test() { - mkdir -p testdir || die - # 'make check' breaks with sandbox, 'make partcheck' works - _emake partcheck prefix="${S}/src" libdir="${S}/src" -} - -multilib_src_install() { - _emake install DESTDIR="${D}" -} - -multilib_src_install_all() { - doman man/* - dodoc ChangeLog TODO - - # move crap to / for multipath-tools #325355 - gen_usr_ldscript -a aio - - # This lib is a bare minimal shim on top of kernel syscalls. - export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n') -} diff --git a/dev-libs/libaio/libaio-0.3.111.ebuild b/dev-libs/libaio/libaio-0.3.111.ebuild deleted file mode 100644 index 904ebacb9c9..00000000000 --- a/dev-libs/libaio/libaio-0.3.111.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript - -DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" -HOMEPAGE="https://pagure.io/libaio"; -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://pagure.io/libaio.git"; -else - SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -fi -LICENSE="LGPL-2" -SLOT="0" -IUSE="static-libs test" -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.109-install.patch - "${FILESDIR}"/${PN}-0.3.110-cppflags.patch - "${FILESDIR}"/${PN}-0.3.111-optional-werror.patch - "${FILESDIR}"/${PN}-0.3.110-link-stdlib.patch #558406 -) - -src_prepare() { - default - - local sed_args=( - -e "/^prefix=/s:/usr:${EPREFIX}/usr:" - -e '/^libdir=/s:lib$:$(ABI_LIBDIR):' - ) - if ! use static-libs; then - sed_args+=( -e '/\tinstall .*\/libaio.a/d' ) - # Tests require the static library to be built. - use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' ) - fi - sed -i "${sed_args[@]}" src/Makefile Makefile || die - - multilib_copy_sources -} - -multilib_src_configure() { - if use arm ; then - # When building for thumb, we can't allow frame pointers. - # http://crbug.com/464517 - if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then - append-flags -fomit-frame-pointer - fi - fi -} - -_emake() { - CC=$(tc-getCC) \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) \ - ABI_LIBDIR=$(get_libdir) \ - CFLAGS_WERROR= \ - emake "$@" -} - -multilib_src_compile() { - _emake -} - -multilib_src_test() { - mkdir -p testdir || die - # 'make check' breaks with sandbox, 'make partcheck' works - _emake partcheck prefix="${S}/src" libdir="${S}/src" -} - -multilib_src_install() { - _emake install DESTDIR="${D}" -} - -multilib_src_install_all() { - doman man/* - dodoc ChangeLog TODO - - # move crap to / for multipath-tools #325355 - gen_usr_ldscript -a aio - - # This lib is a bare minimal shim on top of kernel syscalls. - export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n') -}
