diff options
author | 2014-03-27 03:13:47 +0000 | |
---|---|---|
committer | 2014-03-27 03:13:47 +0000 | |
commit | d752b35c47f35dd632f3cdd06659b6bb0004a9b7 (patch) | |
tree | e1b007a88a5a2a5bb0594e916402bb0c2d1ab05b | |
parent | Version bump, bug 502246. (diff) | |
download | gentoo-2-d752b35c47f35dd632f3cdd06659b6bb0004a9b7.tar.gz gentoo-2-d752b35c47f35dd632f3cdd06659b6bb0004a9b7.tar.bz2 gentoo-2-d752b35c47f35dd632f3cdd06659b6bb0004a9b7.zip |
Version bump.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
-rw-r--r-- | dev-libs/libaio/ChangeLog | 9 | ||||
-rw-r--r-- | dev-libs/libaio/files/libaio-0.3.110-cppflags.patch | 25 | ||||
-rw-r--r-- | dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch | 30 | ||||
-rw-r--r-- | dev-libs/libaio/libaio-0.3.110.ebuild | 72 |
4 files changed, 135 insertions, 1 deletions
diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog index 660109ff7b84..532fbc884bd6 100644 --- a/dev-libs/libaio/ChangeLog +++ b/dev-libs/libaio/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-libs/libaio # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.86 2014/03/27 02:09:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.87 2014/03/27 03:13:46 vapier Exp $ + +*libaio-0.3.110 (27 Mar 2014) + + 27 Mar 2014; Mike Frysinger <vapier@gentoo.org> + +files/libaio-0.3.110-cppflags.patch, + +files/libaio-0.3.110-optional-werror.patch, +libaio-0.3.110.ebuild: + Version bump. *libaio-0.3.109-r5 (27 Mar 2014) diff --git a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch new file mode 100644 index 000000000000..4567ac946681 --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch @@ -0,0 +1,25 @@ +From 3bf96bb62370035dba18d4b25459406b32365cfc Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Wed, 26 Mar 2014 23:10:18 -0400 +Subject: [PATCH] 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 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-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch new file mode 100644 index 000000000000..2933cf5244bc --- /dev/null +++ b/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch @@ -0,0 +1,30 @@ +From 0cc7dc108d0b2288b40d82bb2fd1fd8bdc08f764 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +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 <vapier@gentoo.org> +--- + 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 new file mode 100644 index 000000000000..a5d34ee3e19c --- /dev/null +++ b/dev-libs/libaio/libaio-0.3.110.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.110.ebuild,v 1.1 2014/03/27 03:13:46 vapier Exp $ + +EAPI=5 + +inherit eutils multilib-minimal toolchain-funcs + +DESCRIPTION="Asynchronous input/output library that uses the kernels native interface" +HOMEPAGE="https://git.fedorahosted.org/cgit/libaio.git/ http://lse.sourceforge.net/io/aio.html" +SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs 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 + + 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 +} + +_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') +} |