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

[Davide Pesavento]

commit:     e3a63d518b571f545332c6cfbccb31d5e8dac4fb
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Jun 28 23:45:36 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 23:45:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e3a63d51

[qt5-build.eclass] Run qmake "manually" at the top level too.

The recursive qmake that is executed at the end of configure is very
time-consuming, not parallelizable and especially it is completely useless,
since we already re-run qmake with custom arguments in all the relevant
directories. The only exception is the top-level project file (qtbase.pro),
which must be handled separately.

Therefore we can delete the recursive qmake invocation from configure
altogether. This also avoids pre-stripping of the qmake binary itself.

---
 eclass/qt5-build.eclass |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index e206a4e..0ea8a8b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -178,6 +178,10 @@ qt5-build_src_prepare() {
 		'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \
 		configure || die "sed configure failed"
 
+	# Don't run qmake at the end of configure
+	sed -i -e '/echo "Creating makefiles\./,+2 d' \
+		configure || die "sed configure failed"
+
 	# Respect CXX in configure
 	sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
 		configure || die "sed QMAKE_CONF_COMPILER failed"
@@ -258,8 +262,13 @@ qt5-build_src_configure() {
 	)
 
 	pushd "${QT5_BUILD_DIR}" >/dev/null || die
+
 	einfo "Configuring with: ${conf[@]}"
 	"${S}"/configure "${conf[@]}" || die "configure failed"
+
+	einfo "Running qmake on top-level project file"
+	./bin/qmake "${S}"/qtbase.pro CONFIG+=nostrip || die
+
 	popd >/dev/null || die
 
 	qmake() {