commit: 7651be23a9d3c0d0b230001c727b882a9039bbaa
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 3 15:04:19 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 3 15:04:19 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7651be23
[dev-qt/qtcore:4] Move mkspecs and qmake installation to eclass.
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 2 --
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 2 --
eclass/qt4-build-multilib.eclass | 6 ++++++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild
b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 783bbdb..c446934 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -86,8 +86,6 @@ src_configure() {
src_install() {
qt4-build-multilib_src_install
- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
-
# List all the multilib libdirs
local libdirs=
for libdir in $(get_all_libdirs); do
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 783bbdb..c446934 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -86,8 +86,6 @@ src_configure() {
src_install() {
qt4-build-multilib_src_install
- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
-
# List all the multilib libdirs
local libdirs=
for libdir in $(get_all_libdirs); do
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 86285af..5511995 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -396,12 +396,18 @@ multilib_src_install() {
qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
+ if [[ ${PN} == qtcore ]]; then
+ einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake}"
+ emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
+ fi
+
# install private headers of a few modules
if has ${PN} qtcore qtdeclarative qtgui qtscript; then
local moduledir=${PN#qt}
local modulename=Qt$(tr 'a-z' 'A-Z' <<<
${moduledir:0:1})${moduledir:1}
[[ ${moduledir} == core ]] && moduledir=corelib
+ einfo "Installing private headers into
${QT4_HEADERDIR}/${modulename}/private"
insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private
find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins
'{}' + || die
fi
