Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: python@g.o, "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 7/8] Move run_in_build_dir() to multibuild.eclass.
Date: Wed, 27 Feb 2013 21:46:44
Message-Id: 1362001405-25636-7-git-send-email-mgorny@gentoo.org
In Reply to: [gentoo-dev] [RFC] multibuild.eclass -- a generic pluggable framework to handle multi-variant builds by "Michał Górny"
1 ---
2 gx86/eclass/multibuild.eclass | 19 +++++++++++++++++++
3 gx86/eclass/python-r1.eclass | 19 -------------------
4 2 files changed, 19 insertions(+), 19 deletions(-)
5
6 diff --git a/gx86/eclass/multibuild.eclass b/gx86/eclass/multibuild.eclass
7 index a4d5d11..e15b74e 100644
8 --- a/gx86/eclass/multibuild.eclass
9 +++ b/gx86/eclass/multibuild.eclass
10 @@ -173,5 +173,24 @@ multibuild_parallel_foreach() {
11 return ${ret}
12 }
13
14 +# @FUNCTION: run_in_build_dir
15 +# @USAGE: <argv>...
16 +# @DESCRIPTION:
17 +# Run the given command in the directory pointed by BUILD_DIR.
18 +run_in_build_dir() {
19 + debug-print-function ${FUNCNAME} "${@}"
20 + local ret
21 +
22 + [[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified."
23 + [[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set."
24 +
25 + pushd "${BUILD_DIR}" >/dev/null || die
26 + "${@}"
27 + ret=${?}
28 + popd >/dev/null || die
29 +
30 + return ${ret}
31 +}
32 +
33 _MULTIBUILD=1
34 fi
35 diff --git a/gx86/eclass/python-r1.eclass b/gx86/eclass/python-r1.eclass
36 index fb9032e..6c1dc3e 100644
37 --- a/gx86/eclass/python-r1.eclass
38 +++ b/gx86/eclass/python-r1.eclass
39 @@ -735,24 +735,5 @@ python_replicate_script() {
40 done
41 }
42
43 -# @FUNCTION: run_in_build_dir
44 -# @USAGE: <argv>...
45 -# @DESCRIPTION:
46 -# Run the given command in the directory pointed by BUILD_DIR.
47 -run_in_build_dir() {
48 - debug-print-function ${FUNCNAME} "${@}"
49 - local ret
50 -
51 - [[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified."
52 - [[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set."
53 -
54 - pushd "${BUILD_DIR}" >/dev/null || die
55 - "${@}"
56 - ret=${?}
57 - popd >/dev/null || die
58 -
59 - return ${ret}
60 -}
61 -
62 _PYTHON_R1=1
63 fi
64 --
65 1.8.1.4