diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /dev-libs/libaio | |
parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) |
gentoo resync : 28.04.2019
Diffstat (limited to 'dev-libs/libaio')
-rw-r--r-- | dev-libs/libaio/Manifest | 8 | ||||
-rw-r--r-- | dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch | 30 | ||||
-rw-r--r-- | dev-libs/libaio/files/libaio-0.3.112-cppflags.patch | 25 | ||||
-rw-r--r-- | dev-libs/libaio/files/libaio-0.3.112-install.patch | 60 | ||||
-rw-r--r-- | dev-libs/libaio/libaio-0.3.111.ebuild | 87 | ||||
-rw-r--r-- | dev-libs/libaio/libaio-9999.ebuild | 87 | ||||
-rw-r--r-- | dev-libs/libaio/metadata.xml | 4 |
7 files changed, 298 insertions, 3 deletions
diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest index eab9eb608ae0..78138c20cba4 100644 --- a/dev-libs/libaio/Manifest +++ b/dev-libs/libaio/Manifest @@ -4,6 +4,12 @@ AUX libaio-0.3.109-x32.patch 2122 BLAKE2B 45d7487af74f14cb5212cdd87137de0714a91d AUX libaio-0.3.110-cppflags.patch 629 BLAKE2B 0fb7bee48ba36c68aad96f76254fb7efaa158158f7b786bc4e3b92fefb01cde79363b1ee9898d4b0a9b8637d32d7b0148b217291f3ea493c45fb29539e0e647e SHA512 b39fabcb37e75ab9300d78476a7468359efa883a49822db28d11d305d557f835ac9245b9c8c3e0a8ff6c7fd70125c841056f1e22175025d16a99ce94f849f80c AUX libaio-0.3.110-link-stdlib.patch 731 BLAKE2B 9599f75d405de3c1fd38c15cdcac6c65e624674d0be01982d13480fa0fe4020ebfebf0d22b1614cb70d4533f93d1dd58f293aff314a414d84c94fbab499db3da SHA512 b434da8190ca145fcdd64aa788be5d8bd1b44c112e117bfb8583cce91cfdcfb52038189bd9c92d690286e6576d82e74e62b465585f6333f1a920769ddbe29c32 AUX libaio-0.3.110-optional-werror.patch 832 BLAKE2B d732c6c15247a6b601e4296acfe9733109360dc57f4397f7ae35a207b5c98e652d9c9dd67d52bf4997a26498a58722a77dcceb01df9b0b39289f51596e39aa2d SHA512 14b73acded7f67d01e199c411f2ea090b1d0d666521233d3829ca76572d6962f5dc3560096dc10e13c342eed046fb47a6e370e57fceab457696fad6c888a5067 +AUX libaio-0.3.111-optional-werror.patch 911 BLAKE2B f6ce9b16bfe7d3fe3fde520c4e6438b534b1ea54561faf94229cbdaa2cae40ee6e6ab0e9a689f08f7e43442d1b863bdf2c42e784774cca89003feb5dbbffd63b SHA512 8315c9ca018578d4b8e81b87ce155d8ebfc586be68f24659a91f027449cd27a9660b2cf33ce47fcf240ce44f2b7f1095e8d5996ad08782d91392f6dd8fafa5a8 +AUX libaio-0.3.112-cppflags.patch 610 BLAKE2B f3b79a3b1abdb40741b15a53e3308defa5538a01744f02b13a03af686176c753fad02d6977b9213ffcde6b6fd11261a7c23476adf1a23b87bbf1a64834a4b790 SHA512 160ba75e05066eb5114d7a7e6d14b2e92e670d664c2f179b9703140cbcfa96df803166dff008b0bc0c2edfa7050d03c7d5aa4fbf5d8f4fb1beea02e3ca172942 +AUX libaio-0.3.112-install.patch 1921 BLAKE2B 5338c1deab3152fec06dfcebc3c3527fd8df77640700e9a95db831b30c4b56ffef65fa50dd8669608c7dcc63eba302e87646e63d4fefb2313369ac175836ff23 SHA512 56009ed2cde7b9f7a6e7f64c4348d3b78807e2d72a44f39c811004a14e6757e53a94739e7513ae7e3a1f2efef1ecfdf98f61f24b70a65c6f9d320ea94415a443 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3 +DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e EBUILD libaio-0.3.110.ebuild 2213 BLAKE2B 109c4534a9c9c2329cba96f30bdc0262020e3bbb1d39494b4f0338914080aaee990b780076bad97030fe68e7eba5f9d6585b6011f09e45ff2cd605b531bc2ea5 SHA512 80601b081b9362ce194d91a760395ccbfac4bd8e0a089c55c1715504939b742ec9e4b313dd3fb382058d0ae5a08f9ea8670938a3405655e7de7feb3c1de6ec09 -MISC metadata.xml 486 BLAKE2B 43aa0a024083520564b0d28107823426803ffbc891c168c28a290f74f63b0e3b36d25d7d7d1f4caa6a32fc35ef203147d120c8c4b0b2929d7237a3a216906d93 SHA512 4506edd4b7820f2d86f36d212399d011efe56860319103cc93920672e4a49c2618bc96ed167e69356d2ed3f667520e7874a7a85024d08b81861c3ddf4f26bebb +EBUILD libaio-0.3.111.ebuild 2189 BLAKE2B 290e8c4db10249c59c232baf00cbbca15ca2fc05fd6fd1ab5e824ecf22205be87fc484e0227ad25ea95167b49f492cc772eaa9fba3fc5e59de40a0a945718aa0 SHA512 5d956fd5d4b1d63468ae7ba8cddb2c57e34f724c9d6ebdbf0f90d2979c06a0d9fba3f7836472619f7529feef7282505ca2b67415f3bd7f4877e7321f6fa62c62 +EBUILD libaio-9999.ebuild 2135 BLAKE2B d77e5b3cbf65b30c3ffa974fa2ea703df4f30d70fe3ee8705644c297686c35e58e807e6f840c571f3fbdfc855f573e71f4f4564f6c0f8b525d82af5cb9878fb9 SHA512 2715b824d05430b8d5f3b252b2dc9354d71869fa7c6cbc676eeec169f8a1d7c1a85f224fa4fc9321b76b3d5280fe35f67f28a5c227c9ea75d21edd1d0475eacd +MISC metadata.xml 486 BLAKE2B 68cdbe0bbc0e629e59f580672dee5d694d8f411d81f60c249220aa60a8fee8cbac7add2910e265afce266923127fa6d0ccdf7d3adecdc2a25c752cb80028b006 SHA512 e8301c12097a02130a43f9349dea0cfa5418db8c6f76ae638e01631039caf21cd3b9f8a39255c12a58c779270239d7bf086842997e96ff7c0cfedb550fe44ab1 diff --git a/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch new file mode 100644 index 000000000000..5b6f91e56d98 --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch @@ -0,0 +1,30 @@ +From ebe62b178f3e5fcde8a311e64aaffe62099204a5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 21 Apr 2019 12:44:26 +0200 +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 <vapier@gentoo.org> +--- + harness/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/harness/Makefile b/harness/Makefile +index f477737..a155c4b 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 -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE) ++CFLAGS_WERROR?=-Werror ++CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE) + #-lpthread -lrt + + all: $(PROGS) +-- +2.21.0 + diff --git a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch new file mode 100644 index 000000000000..2f1ba4b7aec1 --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch @@ -0,0 +1,25 @@ +From 1df69d571c5b764c42ba17970707cc29d2394a25 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 21 Apr 2019 13:04:24 +0200 +Subject: [PATCH 2/2] respect env CPPFLAGS + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + src/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Makefile b/src/Makefile +index 66534b9..44bbef8 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -5,6 +5,7 @@ usrlibdir=$(libdir) + + CFLAGS ?= -g -fomit-frame-pointer -O2 + CFLAGS += -Wall -I. -fPIC ++CFLAGS += $(CPPFLAGS) + SO_CFLAGS=-shared $(CFLAGS) + L_CFLAGS=$(CFLAGS) + LINK_FLAGS= +-- +2.21.0 + diff --git a/dev-libs/libaio/files/libaio-0.3.112-install.patch b/dev-libs/libaio/files/libaio-0.3.112-install.patch new file mode 100644 index 000000000000..d1b1873b501a --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.112-install.patch @@ -0,0 +1,60 @@ +From f8fbbc9733035c96ffb085726bf24d15502e1095 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Sun, 21 Apr 2019 13:02:16 +0200 +Subject: [PATCH 1/2] 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 <vapier@gentoo.org> +--- + Makefile | 2 +- + src/Makefile | 11 ++++++----- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index c1fb831..e9dbdb0 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ all: + @$(MAKE) -C src + + install: +- @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) ++ @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) + + check: + @$(MAKE) -C harness check +diff --git a/src/Makefile b/src/Makefile +index 37ae219..66534b9 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 += -Wall -I. -fPIC +@@ -58,12 +59,12 @@ $(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 644 libaio.h $(DESTDIR)$(includedir)/libaio.h ++ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a + ifeq ($(ENABLE_SHARED),1) +- install -D -m 755 $(libname) $(libdir)/$(libname) +- ln -sf $(libname) $(libdir)/$(soname) +- ln -sf $(libname) $(libdir)/libaio.so ++ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname) ++ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname) ++ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so + endif + + $(libaio_objs): libaio.h +-- +2.21.0 + diff --git a/dev-libs/libaio/libaio-0.3.111.ebuild b/dev-libs/libaio/libaio-0.3.111.ebuild new file mode 100644 index 000000000000..1f25348ff600 --- /dev/null +++ b/dev-libs/libaio/libaio-0.3.111.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal toolchain-funcs flag-o-matic + +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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +fi +LICENSE="LGPL-2" +SLOT="0" +IUSE="static-libs 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') +} diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild new file mode 100644 index 000000000000..ddaf4e22813e --- /dev/null +++ b/dev-libs/libaio/libaio-9999.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal toolchain-funcs flag-o-matic + +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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +fi +LICENSE="LGPL-2" +SLOT="0" +IUSE="static-libs test" + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.112-install.patch + "${FILESDIR}"/${PN}-0.3.112-cppflags.patch + "${FILESDIR}"/${PN}-0.3.111-optional-werror.patch +) + +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') +} diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml index 9f4f6e46b46a..68c6fef5c3a6 100644 --- a/dev-libs/libaio/metadata.xml +++ b/dev-libs/libaio/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>gokturk@gentoo.org</email> - <name>Göktürk Yüksek</name> + <email>whissi@gentoo.org</email> + <name>Thomas Deutschmann</name> </maintainer> <longdescription>Library to provide user-level kernel Asynchronous I/O (AIO) support for Linux (needs kernel patches as of 2.6.12)</longdescription> |