| 1 |
commit: 7651be23a9d3c0d0b230001c727b882a9039bbaa |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 3 15:04:19 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 3 15:04:19 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7651be23 |
| 7 |
|
| 8 |
[dev-qt/qtcore:4] Move mkspecs and qmake installation to eclass. |
| 9 |
|
| 10 |
--- |
| 11 |
dev-qt/qtcore/qtcore-4.8.6.ebuild | 2 -- |
| 12 |
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 2 -- |
| 13 |
eclass/qt4-build-multilib.eclass | 6 ++++++ |
| 14 |
3 files changed, 6 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 17 |
index 783bbdb..c446934 100644 |
| 18 |
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 19 |
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild |
| 20 |
@@ -86,8 +86,6 @@ src_configure() { |
| 21 |
src_install() { |
| 22 |
qt4-build-multilib_src_install |
| 23 |
|
| 24 |
- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} |
| 25 |
- |
| 26 |
# List all the multilib libdirs |
| 27 |
local libdirs= |
| 28 |
for libdir in $(get_all_libdirs); do |
| 29 |
|
| 30 |
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 31 |
index 783bbdb..c446934 100644 |
| 32 |
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 33 |
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild |
| 34 |
@@ -86,8 +86,6 @@ src_configure() { |
| 35 |
src_install() { |
| 36 |
qt4-build-multilib_src_install |
| 37 |
|
| 38 |
- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} |
| 39 |
- |
| 40 |
# List all the multilib libdirs |
| 41 |
local libdirs= |
| 42 |
for libdir in $(get_all_libdirs); do |
| 43 |
|
| 44 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 45 |
index 86285af..5511995 100644 |
| 46 |
--- a/eclass/qt4-build-multilib.eclass |
| 47 |
+++ b/eclass/qt4-build-multilib.eclass |
| 48 |
@@ -396,12 +396,18 @@ multilib_src_install() { |
| 49 |
|
| 50 |
qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install |
| 51 |
|
| 52 |
+ if [[ ${PN} == qtcore ]]; then |
| 53 |
+ einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake}" |
| 54 |
+ emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} |
| 55 |
+ fi |
| 56 |
+ |
| 57 |
# install private headers of a few modules |
| 58 |
if has ${PN} qtcore qtdeclarative qtgui qtscript; then |
| 59 |
local moduledir=${PN#qt} |
| 60 |
local modulename=Qt$(tr 'a-z' 'A-Z' <<< ${moduledir:0:1})${moduledir:1} |
| 61 |
[[ ${moduledir} == core ]] && moduledir=corelib |
| 62 |
|
| 63 |
+ einfo "Installing private headers into ${QT4_HEADERDIR}/${modulename}/private" |
| 64 |
insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private |
| 65 |
find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die |
| 66 |
fi |
Archives