From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-dev+bounces-59082-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 44F40198005
for <garchives@archives.gentoo.org>; Sun, 10 Mar 2013 10:19:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A26FFE0741;
Sun, 10 Mar 2013 10:17:49 +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 D1940E0733
for <gentoo-dev@lists.gentoo.org>; Sun, 10 Mar 2013 10:17:48 +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 CD16E33BF5F;
Sun, 10 Mar 2013 10:17:46 +0000 (UTC)
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: hasufell@gentoo.org,
python@gentoo.org,
=?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 4/7] multilib-minimal: reuse run_in_build_dir.
Date: Sun, 10 Mar 2013 11:18:08 +0100
Message-Id: <1362910691-8439-4-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: <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: 33e21ecc-0d47-41fa-a8ae-e16ed22c3326
X-Archives-Hash: 4a5753fe9db9e72335396e4fb2705f9f
---
gx86/eclass/multilib-minimal.eclass | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/gx86/eclass/multilib-minimal.eclass b/gx86/eclass/multilib-minimal.eclass
index a77368e..2510578 100644
--- a/gx86/eclass/multilib-minimal.eclass
+++ b/gx86/eclass/multilib-minimal.eclass
@@ -35,6 +35,10 @@ inherit multibuild multilib-build
EXPORT_FUNCTIONS src_configure src_compile src_test src_install
+_multilib-minimal_wrap_phase() {
+ run_in_build_dir "${@}"
+}
+
multilib-minimal_src_configure() {
_multilib-minimal_mkdir() {
mkdir -p "${BUILD_DIR}" || die
@@ -42,58 +46,50 @@ multilib-minimal_src_configure() {
multilib_foreach_abi _multilib-minimal_mkdir
multilib-minimal_abi_src_configure() {
- pushd "${BUILD_DIR}" >/dev/null || die
if declare -f multilib_src_configure >/dev/null ; then
multilib_src_configure
else
default_src_configure
fi
- popd >/dev/null || die
}
- multilib_foreach_abi multilib-minimal_abi_src_configure
+ multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_configure
}
multilib-minimal_src_compile() {
multilib-minimal_abi_src_compile() {
- pushd "${BUILD_DIR}" >/dev/null || die
if declare -f multilib_src_compile >/dev/null ; then
multilib_src_compile
else
default_src_compile
fi
- popd >/dev/null || die
}
- multilib_foreach_abi multilib-minimal_abi_src_compile
+ multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_compile
}
multilib-minimal_src_test() {
multilib-minimal_abi_src_test() {
- pushd "${BUILD_DIR}" >/dev/null || die
if declare -f multilib_src_test >/dev/null ; then
multilib_src_test
else
default_src_test
fi
- popd >/dev/null || die
}
- multilib_foreach_abi multilib-minimal_abi_src_test
+ multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_test
}
multilib-minimal_src_install() {
multilib-minimal_abi_src_install() {
- pushd "${BUILD_DIR}" >/dev/null || die
if declare -f multilib_src_install >/dev/null ; then
multilib_src_install
else
default_src_install
fi
multilib_check_headers
- popd >/dev/null || die
}
- multilib_foreach_abi multilib-minimal_abi_src_install
+ multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_install
if declare -f multilib_src_install_all >/dev/null ; then
multilib_src_install_all
--
1.8.1.5