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

["Davide Pesavento" <pesa@gentoo.org>]

commit:     59b90c149df119858af48bdab8824245576c88c4
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Nov 19 01:29:57 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 01:29:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=59b90c14

[qt5-build.eclass] Overhaul qmake handling.

Invoke qmake once for each target subdir, instead of doing one huge
recursive call at the root of the build tree. This is faster, less
hacky and slightly more correct.

The recursive call was previously needed in order to create all the
qt_lib_*.pri files, but since we can use QMAKEMODULES to tell qmake
where to find the .pri files for already installed modules, the
recursive call is no longer necessary.

---
 eclass/qt5-build.eclass |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e113969..7006406 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -202,9 +202,6 @@ qt5-build_src_prepare() {
 		qt5_symlink_tools_to_buildtree
 	fi
 
-	# Remove unused project files to speed up recursive qmake invocation
-	rm -f demos/demos.pro examples/examples.pro tests/tests.pro
-
 	# Apply patches
 	[[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 	epatch_user
@@ -225,12 +222,7 @@ qt5-build_src_configure() {
 		qt5_base_configure
 	fi
 
-	einfo "Running qmake"
-	./bin/qmake -recursive \
-		"${S}"/${EGIT_PROJECT}.pro \
-		QMAKE_LIBDIR+="${QT5_BUILD_DIR}/lib" \
-		QMAKE_LIBDIR+="${QT5_LIBDIR}" \
-		|| die "qmake failed"
+	qt5_foreach_target_subdir qt5_qmake
 
 	popd > /dev/null || die
 }
@@ -260,12 +252,7 @@ qt5-build_src_test() {
 	EOF
 	chmod +x "${testrunner}"
 
-	qmake() {
-		"${QT5_BUILD_DIR}"/bin/qmake \
-			"${S}/${subdir}/${subdir##*/}.pro" \
-			|| die "qmake failed"
-	}
-	qt5_foreach_target_subdir qmake
+	qt5_foreach_target_subdir qt5_qmake
 	qt5_foreach_target_subdir emake
 	qt5_foreach_target_subdir emake TESTRUNNER="'${testrunner}'" check
 }
@@ -350,6 +337,8 @@ qt5_prepare_env() {
 	QT5_EXAMPLESDIR=${QT5_DATADIR}/examples
 	QT5_TESTSDIR=${QT5_DATADIR}/tests
 	QT5_SYSCONFDIR=${EPREFIX}/etc/qt5
+
+	export QMAKEMODULES=${QT5_ARCHDATADIR}/mkspecs/modules
 }
 
 # @FUNCTION: qt5_symlink_tools_to_buildtree
@@ -399,9 +388,10 @@ qt5_base_configure() {
 		# C++11 support
 		$(qt_use c++11)
 
-		# general configure options
+		# build shared libraries
 		-shared
-		-dont-process
+
+		# use pkg-config to detect include and library paths
 		-pkg-config
 
 		# prefer system libraries
@@ -449,6 +439,23 @@ qt5_base_configure() {
 	"${S}"/configure "${conf[@]}" || die "configure failed"
 }
 
+# @FUNCTION: qt5_qmake
+# @INTERNAL
+# @DESCRIPTION:
+# Helper function that runs qmake in the current target subdir.
+# Intended to be called by qt5_foreach_target_subdir().
+qt5_qmake() {
+	local projectfile=${S}/
+	if [[ -n ${subdir} ]]; then
+		projectfile+=${subdir}/${subdir##*/}.pro
+	else
+		projectfile+=${EGIT_PROJECT}.pro
+	fi
+
+	"${QT5_BUILD_DIR}"/bin/qmake "${projectfile}" \
+		|| die "qmake failed (${projectfile})"
+}
+
 # @FUNCTION: qt5_foreach_target_subdir
 # @INTERNAL
 # @DESCRIPTION: