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 70086198005 for ; Sun, 10 Mar 2013 10:20:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6018EE07B4; Sun, 10 Mar 2013 10:17:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E3EFE07AA for ; Sun, 10 Mar 2013 10:17:55 +0000 (UTC) Received: from pomiocik.lan (77-255-9-250.adsl.inetia.pl [77.255.9.250]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 9F99633C3B4; Sun, 10 Mar 2013 10:17:52 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: hasufell@gentoo.org, python@gentoo.org, =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 7/7] autotools-multilib: reuse phase functions from multilib-minimal. Date: Sun, 10 Mar 2013 11:18:11 +0100 Message-Id: <1362910691-8439-7-git-send-email-mgorny@gentoo.org> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <20130310111644.0840d935@pomiocik.lan> References: <20130310111644.0840d935@pomiocik.lan> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Archives-Salt: ec3a3184-3553-4cc1-9c5d-0ac91f9f50c8 X-Archives-Hash: 2bd533739c8b28f0e1b5c3dccbd34486 This makes replacing sub-phase functions much easier. --- gx86/eclass/autotools-multilib.eclass | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/gx86/eclass/autotools-multilib.eclass b/gx86/eclass/autotools-multilib.eclass index d7372b0..d04fd1f 100644 --- a/gx86/eclass/autotools-multilib.eclass +++ b/gx86/eclass/autotools-multilib.eclass @@ -29,33 +29,47 @@ if [[ ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then die "${ECLASS}: multilib support requires out-of-source builds." fi -inherit autotools-utils multilib-build +inherit autotools-utils multibuild multilib-minimal EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install +multibuild_export_phases \ + multilib_src_configure multilib_src_compile multilib_src_test \ + multilib_src_install autotools-multilib_src_prepare() { autotools-utils_src_prepare "${@}" } autotools-multilib_src_configure() { - multilib_parallel_foreach_abi autotools-utils_src_configure "${@}" + multilib-minimal_src_configure "${@}" } autotools-multilib_src_compile() { - multilib_foreach_abi autotools-utils_src_compile "${@}" + multilib-minimal_src_compile "${@}" } autotools-multilib_src_test() { - multilib_foreach_abi autotools-utils_src_test "${@}" + multilib-minimal_src_test "${@}" } autotools-multilib_src_install() { - autotools-multilib_secure_install() { - autotools-utils_src_install "${@}" + multilib-minimal_src_install "${@}" +} + +# multilib-minimal phases + +autotools-multilib_multilib_src_configure() { + autotools-utils_src_configure "${@}" +} - # Make sure all headers are the same for each ABI. - multilib_check_headers - } +autotools-multilib_multilib_src_compile() { + autotools-utils_src_compile "${@}" +} + +autotools-multilib_multilib_src_test() { + autotools-utils_src_test "${@}" +} - multilib_foreach_abi autotools-multilib_secure_install "${@}" +autotools-multilib_multilib_src_install() { + autotools-utils_src_install "${@}" } -- 1.8.1.5