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