From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-dev+bounces-58875-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E4FB9198005
for <garchives@archives.gentoo.org>; Wed, 27 Feb 2013 21:44:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 376D1E0ADB;
Wed, 27 Feb 2013 21:43:14 +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 0711CE0AD1
for <gentoo-dev@lists.gentoo.org>; Wed, 27 Feb 2013 21:43:12 +0000 (UTC)
Received: from pomiocik.lan (77-253-193-205.adsl.inetia.pl [77.253.193.205])
(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 28AAB33DF6D;
Wed, 27 Feb 2013 21:43:10 +0000 (UTC)
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: python@gentoo.org,
=?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 4/8] Convert multilib-build to use multibuild.
Date: Wed, 27 Feb 2013 22:43:21 +0100
Message-Id: <1362001405-25636-4-git-send-email-mgorny@gentoo.org>
X-Mailer: git-send-email 1.8.1.4
In-Reply-To: <20130227224152.6d1293c9@pomiocik.lan>
References: <20130227224152.6d1293c9@pomiocik.lan>
Precedence: bulk
List-Post: <mailto:gentoo-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org>
X-BeenThere: gentoo-dev@lists.gentoo.org
Reply-to: gentoo-dev@lists.gentoo.org
X-Archives-Salt: 137d64b5-4d1e-407a-8476-051817dc6203
X-Archives-Hash: 74d6588b063e57813aa280779fcc5b02
---
gx86/eclass/multilib-build.eclass | 45 ++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/gx86/eclass/multilib-build.eclass b/gx86/eclass/multilib-build.eclass
index b1afd85..4321e45 100644
--- a/gx86/eclass/multilib-build.eclass
+++ b/gx86/eclass/multilib-build.eclass
@@ -23,7 +23,7 @@ case ${EAPI:-0} in
*) die "EAPI=${EAPI} is not supported" ;;
esac
-inherit multilib multiprocessing
+inherit multibuild multilib
# @ECLASS-VARIABLE: _MULTILIB_FLAGS
# @INTERNAL
@@ -85,6 +85,19 @@ multilib_get_enabled_abis() {
fi
}
+# @FUNCTION: _multilib_multibuild_wrapper
+# @USAGE: <argv>...
+# @INTERNAL
+# @DESCRIPTION:
+# Initialize the environment for ABI selected for multibuild.
+_multilib_multibuild_wrapper() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ local ABI=${MULTIBUILD_VARIANT}
+ multilib_toolchain_setup "${ABI}"
+ "${@}"
+}
+
# @FUNCTION: multilib_foreach_abi
# @USAGE: <argv>...
# @DESCRIPTION:
@@ -95,14 +108,11 @@ multilib_get_enabled_abis() {
# If multilib support is disabled, it just runs the commands. No setup
# is done.
multilib_foreach_abi() {
- local initial_dir=${BUILD_DIR:-${S}}
+ debug-print-function ${FUNCNAME} "${@}"
- local ABI
- for ABI in $(multilib_get_enabled_abis); do
- multilib_toolchain_setup "${ABI}"
- local BUILD_DIR=${initial_dir%%/}-${ABI}
- "${@}" | tee -a "${T}/build-${ABI}.log"
- done
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
+
+ multibuild_foreach _multilib_multibuild_wrapper "${@}"
}
# @FUNCTION: multilib_parallel_foreach_abi
@@ -118,24 +128,11 @@ multilib_foreach_abi() {
#
# Useful for running configure scripts.
multilib_parallel_foreach_abi() {
- local initial_dir=${BUILD_DIR:-${S}}
-
- multijob_init
-
- local ABI
- for ABI in $(multilib_get_enabled_abis); do
- (
- multijob_child_init
-
- multilib_toolchain_setup "${ABI}"
- local BUILD_DIR=${initial_dir%%/}-${ABI}
- "${@}" 2>&1 | tee -a "${T}/build-${ABI}.log"
- ) &
+ debug-print-function ${FUNCNAME} "${@}"
- multijob_post_fork
- done
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) )
- multijob_finish
+ multibuild_parallel_foreach _multilib_multibuild_wrapper "${@}"
}
# @FUNCTION: multilib_check_headers
--
1.8.1.4