[gentoo-dev] [PATCH 7/7] autotools-multilib: reuse phase functions from multilib-minimal.

[Michał Górny]

This makes replacing sub-phase functions much easier.
---
 gx86/eclass/autotools-multilib.eclass | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/gx86/eclass/autotools-multilib.eclass b/gx86/eclass/autotools-multilib.eclass
index d7372b0..d04fd1f 100644
--- a/gx86/eclass/autotools-multilib.eclass
+++ b/gx86/eclass/autotools-multilib.eclass
@@ -29,33 +29,47 @@ if [[ ${AUTOTOOLS_IN_SOURCE_BUILD} ]]; then
 	die "${ECLASS}: multilib support requires out-of-source builds."
 fi
 
-inherit autotools-utils multilib-build
+inherit autotools-utils multibuild multilib-minimal
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+multibuild_export_phases \
+	multilib_src_configure multilib_src_compile multilib_src_test \
+	multilib_src_install
 
 autotools-multilib_src_prepare() {
 	autotools-utils_src_prepare "${@}"
 }
 
 autotools-multilib_src_configure() {
-	multilib_parallel_foreach_abi autotools-utils_src_configure "${@}"
+	multilib-minimal_src_configure "${@}"
 }
 
 autotools-multilib_src_compile() {
-	multilib_foreach_abi autotools-utils_src_compile "${@}"
+	multilib-minimal_src_compile "${@}"
 }
 
 autotools-multilib_src_test() {
-	multilib_foreach_abi autotools-utils_src_test "${@}"
+	multilib-minimal_src_test "${@}"
 }
 
 autotools-multilib_src_install() {
-	autotools-multilib_secure_install() {
-		autotools-utils_src_install "${@}"
+	multilib-minimal_src_install "${@}"
+}
+
+# multilib-minimal phases
+
+autotools-multilib_multilib_src_configure() {
+	autotools-utils_src_configure "${@}"
+}
 
-		# Make sure all headers are the same for each ABI.
-		multilib_check_headers
-	}
+autotools-multilib_multilib_src_compile() {
+	autotools-utils_src_compile "${@}"
+}
+
+autotools-multilib_multilib_src_test() {
+	autotools-utils_src_test "${@}"
+}
 
-	multilib_foreach_abi autotools-multilib_secure_install "${@}"
+autotools-multilib_multilib_src_install() {
+	autotools-utils_src_install "${@}"
 }
-- 
1.8.1.5