| 1 |
commit: 41eaa7063fa4ddd13481100fa805ed01b6275705 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 27 15:19:36 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 27 15:19:36 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=41eaa706 |
| 7 |
|
| 8 |
numeric-int64-multibuild.eclass: Set MULTILIB_COMPAT to supported ABIs |
| 9 |
|
| 10 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/numeric-int64-multibuild.eclass | 4 +++- |
| 13 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/eclass/numeric-int64-multibuild.eclass b/eclass/numeric-int64-multibuild.eclass |
| 16 |
index a55db31..6ac7d79 100644 |
| 17 |
--- a/eclass/numeric-int64-multibuild.eclass |
| 18 |
+++ b/eclass/numeric-int64-multibuild.eclass |
| 19 |
@@ -24,6 +24,8 @@ case ${EAPI:-0} in |
| 20 |
*) die "EAPI=${EAPI} is not supported" ;; |
| 21 |
esac |
| 22 |
|
| 23 |
+MULTILIB_COMPAT=( abi_x86_{32,64} ) |
| 24 |
+ |
| 25 |
inherit alternatives-2 eutils fortran-2 multilib-build numeric toolchain-funcs |
| 26 |
|
| 27 |
IUSE="int64" |
| 28 |
@@ -327,6 +329,7 @@ numeric-int64-multibuild_install_alternative() { |
| 29 |
alternatives_for \ |
| 30 |
${alternative} ${module_name} 0 \ |
| 31 |
$(cat "${T}"/alternative-${alternative}.sh) ${@} |
| 32 |
+ rm "${T}"/alternative-${alternative}.sh || die |
| 33 |
} |
| 34 |
numeric-int64-multibuild_foreach_all_abi_variants pc_file ${@} |
| 35 |
numeric-int64-multibuild_foreach_int_abi pc_install ${@} |
| 36 |
@@ -387,7 +390,6 @@ numeric-int64-multibuild_foreach_all_abi_variants() { |
| 37 |
# @DESCRIPTION: |
| 38 |
# Thin wrapper around multibuild_copy_sources() |
| 39 |
numeric-int64-multibuild_copy_sources() { |
| 40 |
- |
| 41 |
debug-print-function ${FUNCNAME} "${@}" |
| 42 |
local MULTIBUILD_VARIANTS=( $(numeric-int64_get_all_abi_variants) ) |
| 43 |
multibuild_copy_sources |
Archives