1 |
This makes replacing sub-phase functions much easier. |
2 |
--- |
3 |
gx86/eclass/autotools-multilib.eclass | 34 ++++++++++++++++++++++++---------- |
4 |
1 file changed, 24 insertions(+), 10 deletions(-) |
5 |
|
6 |
diff --git a/gx86/eclass/autotools-multilib.eclass b/gx86/eclass/autotools-multilib.eclass |
7 |
index d7372b0..d04fd1f 100644 |
8 |
--- a/gx86/eclass/autotools-multilib.eclass |
9 |
+++ b/gx86/eclass/autotools-multilib.eclass |
10 |
@@ -29,33 +29,47 @@ if [[ ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then |
11 |
die "${ECLASS}: multilib support requires out-of-source builds." |
12 |
fi |
13 |
|
14 |
-inherit autotools-utils multilib-build |
15 |
+inherit autotools-utils multibuild multilib-minimal |
16 |
|
17 |
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install |
18 |
+multibuild_export_phases \ |
19 |
+ multilib_src_configure multilib_src_compile multilib_src_test \ |
20 |
+ multilib_src_install |
21 |
|
22 |
autotools-multilib_src_prepare() { |
23 |
autotools-utils_src_prepare "${@}" |
24 |
} |
25 |
|
26 |
autotools-multilib_src_configure() { |
27 |
- multilib_parallel_foreach_abi autotools-utils_src_configure "${@}" |
28 |
+ multilib-minimal_src_configure "${@}" |
29 |
} |
30 |
|
31 |
autotools-multilib_src_compile() { |
32 |
- multilib_foreach_abi autotools-utils_src_compile "${@}" |
33 |
+ multilib-minimal_src_compile "${@}" |
34 |
} |
35 |
|
36 |
autotools-multilib_src_test() { |
37 |
- multilib_foreach_abi autotools-utils_src_test "${@}" |
38 |
+ multilib-minimal_src_test "${@}" |
39 |
} |
40 |
|
41 |
autotools-multilib_src_install() { |
42 |
- autotools-multilib_secure_install() { |
43 |
- autotools-utils_src_install "${@}" |
44 |
+ multilib-minimal_src_install "${@}" |
45 |
+} |
46 |
+ |
47 |
+# multilib-minimal phases |
48 |
+ |
49 |
+autotools-multilib_multilib_src_configure() { |
50 |
+ autotools-utils_src_configure "${@}" |
51 |
+} |
52 |
|
53 |
- # Make sure all headers are the same for each ABI. |
54 |
- multilib_check_headers |
55 |
- } |
56 |
+autotools-multilib_multilib_src_compile() { |
57 |
+ autotools-utils_src_compile "${@}" |
58 |
+} |
59 |
+ |
60 |
+autotools-multilib_multilib_src_test() { |
61 |
+ autotools-utils_src_test "${@}" |
62 |
+} |
63 |
|
64 |
- multilib_foreach_abi autotools-multilib_secure_install "${@}" |
65 |
+autotools-multilib_multilib_src_install() { |
66 |
+ autotools-utils_src_install "${@}" |
67 |
} |
68 |
-- |
69 |
1.8.1.5 |