1 |
commit: 8b3e9c1290a659128adb0f4bbc323ba39413522c |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 29 00:50:42 2014 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 29 00:51:16 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8b3e9c12 |
7 |
|
8 |
[qt4-build-multilib] Do common stuff in multilib_src_install_all(). |
9 |
|
10 |
--- |
11 |
eclass/qt4-build-multilib.eclass | 19 ++++++++++++++----- |
12 |
1 file changed, 14 insertions(+), 5 deletions(-) |
13 |
|
14 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
15 |
index 6b34c46..71ae1b3 100644 |
16 |
--- a/eclass/qt4-build-multilib.eclass |
17 |
+++ b/eclass/qt4-build-multilib.eclass |
18 |
@@ -415,7 +415,7 @@ multilib_src_test() { |
19 |
# @FUNCTION: qt4-build-multilib_src_install |
20 |
# @DESCRIPTION: |
21 |
# Performs the actual installation, running 'emake install' |
22 |
-# inside all QT4_TARGET_DIRECTORIES, and installing qconfigs. |
23 |
+# in all QT4_TARGET_DIRECTORIES, and installing qconfigs. |
24 |
qt4-build-multilib_src_install() { |
25 |
multilib-minimal_src_install |
26 |
} |
27 |
@@ -430,6 +430,19 @@ multilib_src_install() { |
28 |
emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} |
29 |
fi |
30 |
|
31 |
+ install_qconfigs |
32 |
+ fix_library_files |
33 |
+ fix_includes |
34 |
+} |
35 |
+ |
36 |
+multilib_src_install_all() { |
37 |
+ qt4-build-multilib_src_install_all |
38 |
+} |
39 |
+ |
40 |
+# @FUNCTION: qt4-build-multilib_src_install_all |
41 |
+# @DESCRIPTION: |
42 |
+# Common install phase for all multilib ABIs. |
43 |
+qt4-build-multilib_src_install_all() { |
44 |
# install private headers of a few modules |
45 |
if has ${PN} qtcore qtdeclarative qtgui qtscript; then |
46 |
local moduledir=${PN#qt} |
47 |
@@ -441,10 +454,6 @@ multilib_src_install() { |
48 |
find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die |
49 |
fi |
50 |
|
51 |
- install_qconfigs |
52 |
- fix_library_files |
53 |
- fix_includes |
54 |
- |
55 |
# remove .la files since we are building only shared libraries |
56 |
prune_libtool_files |
57 |
} |