aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-12-27 16:19:36 +0100
committerJustin Lecher <jlec@gentoo.org>2015-12-27 16:19:36 +0100
commit41eaa7063fa4ddd13481100fa805ed01b6275705 (patch)
treecca59163cc85a07c982fa20dfc781d8fa2ca1e8a /eclass/numeric-int64-multibuild.eclass
parentintel-sdp.eclass: Import latest tree changes (diff)
downloadsci-41eaa7063fa4ddd13481100fa805ed01b6275705.tar.gz
sci-41eaa7063fa4ddd13481100fa805ed01b6275705.tar.bz2
sci-41eaa7063fa4ddd13481100fa805ed01b6275705.zip
numeric-int64-multibuild.eclass: Set MULTILIB_COMPAT to supported ABIs
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'eclass/numeric-int64-multibuild.eclass')
-rw-r--r--eclass/numeric-int64-multibuild.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/numeric-int64-multibuild.eclass b/eclass/numeric-int64-multibuild.eclass
index a55db3108..6ac7d7910 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