[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     8b3e9c1290a659128adb0f4bbc323ba39413522c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 29 00:50:42 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 29 00:51:16 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8b3e9c12

[qt4-build-multilib] Do common stuff in multilib_src_install_all().

---
 eclass/qt4-build-multilib.eclass | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 6b34c46..71ae1b3 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -415,7 +415,7 @@ multilib_src_test() {
 # @FUNCTION: qt4-build-multilib_src_install
 # @DESCRIPTION:
 # Performs the actual installation, running 'emake install'
-# inside all QT4_TARGET_DIRECTORIES, and installing qconfigs.
+# in all QT4_TARGET_DIRECTORIES, and installing qconfigs.
 qt4-build-multilib_src_install() {
        multilib-minimal_src_install
 }
@@ -430,6 +430,19 @@ multilib_src_install() {
                emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
        fi
 
+       install_qconfigs
+       fix_library_files
+       fix_includes
+}
+
+multilib_src_install_all() {
+       qt4-build-multilib_src_install_all
+}
+
+# @FUNCTION: qt4-build-multilib_src_install_all
+# @DESCRIPTION:
+# Common install phase for all multilib ABIs.
+qt4-build-multilib_src_install_all() {
        # install private headers of a few modules
        if has ${PN} qtcore qtdeclarative qtgui qtscript; then
                local moduledir=${PN#qt}
@@ -441,10 +454,6 @@ multilib_src_install() {
                find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins 
'{}' + || die
        fi
 
-       install_qconfigs
-       fix_library_files
-       fix_includes
-
        # remove .la files since we are building only shared libraries
        prune_libtool_files
 }