[gentoo-commits] proj/sci:master commit in: eclass/

[Justin Lecher]

commit:     41eaa7063fa4ddd13481100fa805ed01b6275705
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 15:19:36 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 15:19:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=41eaa706

numeric-int64-multibuild.eclass: Set MULTILIB_COMPAT to supported ABIs

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 eclass/numeric-int64-multibuild.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/numeric-int64-multibuild.eclass 
b/eclass/numeric-int64-multibuild.eclass
index a55db31..6ac7d79 100644
--- a/eclass/numeric-int64-multibuild.eclass
+++ b/eclass/numeric-int64-multibuild.eclass
@@ -24,6 +24,8 @@ case ${EAPI:-0} in
        *) die "EAPI=${EAPI} is not supported" ;;
 esac
 
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
 inherit alternatives-2 eutils fortran-2 multilib-build numeric toolchain-funcs
 
 IUSE="int64"
@@ -327,6 +329,7 @@ numeric-int64-multibuild_install_alternative() {
                alternatives_for \
                        ${alternative} ${module_name} 0 \
                        $(cat "${T}"/alternative-${alternative}.sh) ${@}
+               rm "${T}"/alternative-${alternative}.sh || die
        }
        numeric-int64-multibuild_foreach_all_abi_variants pc_file ${@}
        numeric-int64-multibuild_foreach_int_abi pc_install ${@}
@@ -387,7 +390,6 @@ numeric-int64-multibuild_foreach_all_abi_variants() {
 # @DESCRIPTION:
 # Thin wrapper around multibuild_copy_sources()
 numeric-int64-multibuild_copy_sources() {
-
        debug-print-function ${FUNCNAME} "${@}"
        local MULTIBUILD_VARIANTS=( $(numeric-int64_get_all_abi_variants) )
        multibuild_copy_sources