From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2FD8D1388C1 for ; Sun, 27 Dec 2015 16:20:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98B1DE07A5; Sun, 27 Dec 2015 16:19:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0C76E07FD for ; Sun, 27 Dec 2015 16:19:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA66D340702 for ; Sun, 27 Dec 2015 16:19:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 221A4CE7 for ; Sun, 27 Dec 2015 16:19:55 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1451229576.41eaa7063fa4ddd13481100fa805ed01b6275705.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/numeric-int64-multibuild.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 41eaa7063fa4ddd13481100fa805ed01b6275705 X-VCS-Branch: master Date: Sun, 27 Dec 2015 16:19:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4ac4ba52-605b-4393-bdcc-9126b219e16d X-Archives-Hash: 6b7092cf5af59563143f211083c27b1a commit: 41eaa7063fa4ddd13481100fa805ed01b6275705 Author: Justin Lecher gentoo org> AuthorDate: Sun Dec 27 15:19:36 2015 +0000 Commit: Justin Lecher gentoo 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 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