1 |
--- |
2 |
gx86/eclass/multilib-minimal.eclass | 20 ++++++++------------ |
3 |
1 file changed, 8 insertions(+), 12 deletions(-) |
4 |
|
5 |
diff --git a/gx86/eclass/multilib-minimal.eclass b/gx86/eclass/multilib-minimal.eclass |
6 |
index a77368e..2510578 100644 |
7 |
--- a/gx86/eclass/multilib-minimal.eclass |
8 |
+++ b/gx86/eclass/multilib-minimal.eclass |
9 |
@@ -35,6 +35,10 @@ inherit multibuild multilib-build |
10 |
EXPORT_FUNCTIONS src_configure src_compile src_test src_install |
11 |
|
12 |
|
13 |
+_multilib-minimal_wrap_phase() { |
14 |
+ run_in_build_dir "${@}" |
15 |
+} |
16 |
+ |
17 |
multilib-minimal_src_configure() { |
18 |
_multilib-minimal_mkdir() { |
19 |
mkdir -p "${BUILD_DIR}" || die |
20 |
@@ -42,58 +46,50 @@ multilib-minimal_src_configure() { |
21 |
multilib_foreach_abi _multilib-minimal_mkdir |
22 |
|
23 |
multilib-minimal_abi_src_configure() { |
24 |
- pushd "${BUILD_DIR}" >/dev/null || die |
25 |
if declare -f multilib_src_configure >/dev/null ; then |
26 |
multilib_src_configure |
27 |
else |
28 |
default_src_configure |
29 |
fi |
30 |
- popd >/dev/null || die |
31 |
} |
32 |
|
33 |
- multilib_foreach_abi multilib-minimal_abi_src_configure |
34 |
+ multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_configure |
35 |
} |
36 |
|
37 |
multilib-minimal_src_compile() { |
38 |
multilib-minimal_abi_src_compile() { |
39 |
- pushd "${BUILD_DIR}" >/dev/null || die |
40 |
if declare -f multilib_src_compile >/dev/null ; then |
41 |
multilib_src_compile |
42 |
else |
43 |
default_src_compile |
44 |
fi |
45 |
- popd >/dev/null || die |
46 |
} |
47 |
|
48 |
- multilib_foreach_abi multilib-minimal_abi_src_compile |
49 |
+ multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_compile |
50 |
} |
51 |
|
52 |
multilib-minimal_src_test() { |
53 |
multilib-minimal_abi_src_test() { |
54 |
- pushd "${BUILD_DIR}" >/dev/null || die |
55 |
if declare -f multilib_src_test >/dev/null ; then |
56 |
multilib_src_test |
57 |
else |
58 |
default_src_test |
59 |
fi |
60 |
- popd >/dev/null || die |
61 |
} |
62 |
|
63 |
- multilib_foreach_abi multilib-minimal_abi_src_test |
64 |
+ multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_test |
65 |
} |
66 |
|
67 |
multilib-minimal_src_install() { |
68 |
multilib-minimal_abi_src_install() { |
69 |
- pushd "${BUILD_DIR}" >/dev/null || die |
70 |
if declare -f multilib_src_install >/dev/null ; then |
71 |
multilib_src_install |
72 |
else |
73 |
default_src_install |
74 |
fi |
75 |
multilib_check_headers |
76 |
- popd >/dev/null || die |
77 |
} |
78 |
- multilib_foreach_abi multilib-minimal_abi_src_install |
79 |
+ multilib_foreach_abi _multilib-minimal_wrap_phase multilib-minimal_abi_src_install |
80 |
|
81 |
if declare -f multilib_src_install_all >/dev/null ; then |
82 |
multilib_src_install_all |
83 |
-- |
84 |
1.8.1.5 |