diff options
| author |   Michael Haubenwallner <haubi@gentoo.org> | 2012-03-12 07:57:39 +0000 |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2012-03-12 07:57:39 +0000 |
| commit | 86a61066932291acbc204f74d687d4662e3f5354 (patch) | |
| tree | ee74edd8785d0e6414b27a1f0d59172e437e7568 /dev-libs/libaio | |
| parent | Fix for 405535 thanks to Ian Delaney (diff) | |
| download | gentoo-2-86a61066932291acbc204f74d687d4662e3f5354.tar.gz gentoo-2-86a61066932291acbc204f74d687d4662e3f5354.tar.bz2 gentoo-2-86a61066932291acbc204f74d687d4662e3f5354.zip | |
Fix for cross-compile support of multilib-portage, bug#407687
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/libaio')
| -rw-r--r-- | dev-libs/libaio/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libaio/libaio-0.3.109-r3.ebuild | 26 |
2 files changed, 25 insertions, 7 deletions
diff --git a/dev-libs/libaio/ChangeLog b/dev-libs/libaio/ChangeLog index d433b1a0c1a7..615758d17c3a 100644 --- a/dev-libs/libaio/ChangeLog +++ b/dev-libs/libaio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libaio # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.62 2012/03/09 16:12:46 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/ChangeLog,v 1.63 2012/03/12 07:57:39 haubi Exp $ + + 12 Mar 2012; Michael Haubenwallner <haubi@gentoo.org> + libaio-0.3.109-r3.ebuild: + Fix for cross-compile support of multilib-portage, bug#407687 *libaio-0.3.109-r3 (09 Mar 2012) diff --git a/dev-libs/libaio/libaio-0.3.109-r3.ebuild b/dev-libs/libaio/libaio-0.3.109-r3.ebuild index f6a2db7b2724..7a1fea019779 100644 --- a/dev-libs/libaio/libaio-0.3.109-r3.ebuild +++ b/dev-libs/libaio/libaio-0.3.109-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r3.ebuild,v 1.1 2012/03/09 16:12:46 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libaio/libaio-0.3.109-r3.ebuild,v 1.2 2012/03/12 07:57:39 haubi Exp $ EAPI="3" @@ -17,17 +17,24 @@ IUSE="static-libs" EMULTILIB_PKG="true" +aio_get_install_abis() { + use multilib && get_install_abis || echo ${ABI:-default} +} + src_unpack() { - for ABI in $(get_install_abis) + local OABI=${ABI} + for ABI in $(aio_get_install_abis) do mkdir -p "${WORKDIR}"/${ABI} || die cd "${WORKDIR}"/${ABI} || die unpack ${A} done + ABI=${OABI} } src_prepare() { - for ABI in $(get_install_abis) + local OABI=${ABI} + for ABI in $(aio_get_install_abis) do einfo "Preparing ${ABI} ABI ..." cd "${WORKDIR}"/${ABI}/${P} || die @@ -44,6 +51,7 @@ src_prepare() { -e '/:=.*strip.*shell.*git/s:=.*:=:' \ src/Makefile Makefile || die done + ABI=${OABI} } emake_libaio() { @@ -56,16 +64,19 @@ emake_libaio() { } src_compile() { - for ABI in $(get_install_abis) + local OABI=${ABI} + for ABI in $(aio_get_install_abis) do einfo "Compiling ${ABI} ABI ..." cd "${WORKDIR}"/${ABI}/${P} || die emake_libaio || die done + ABI=${OABI} } src_test() { - for ABI in $(get_install_abis) + local OABI=${ABI} + for ABI in $(aio_get_install_abis) do einfo "Testing ${ABI} ABI ..." cd "${WORKDIR}"/${ABI}/${P}/harness || die @@ -73,10 +84,12 @@ src_test() { # 'make check' breaks with sandbox, 'make partcheck' works emake_libaio partcheck prefix="${S}/src" libdir="${S}/src" || die done + ABI=${OABI} } src_install() { - for ABI in $(get_install_abis) + local OABI=${ABI} + for ABI in $(aio_get_install_abis) do einfo "Installing ${ABI} ABI ..." cd "${WORKDIR}"/${ABI}/${P} || die @@ -96,6 +109,7 @@ src_install() { # move crap to / for multipath-tools #325355 gen_usr_ldscript -a aio done + ABI=${OABI} if ! use static-libs ; then rm "${ED}"usr/lib*/*.a || die |