From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-481122-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1SkOu8-0003cK-8C
for garchives@archives.gentoo.org; Fri, 29 Jun 2012 00:17:44 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9F9CFE07D7;
Fri, 29 Jun 2012 00:17:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 735C5E07D7
for <gentoo-commits@lists.gentoo.org>; Fri, 29 Jun 2012 00:17:26 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AD8601B4083
for <gentoo-commits@lists.gentoo.org>; Fri, 29 Jun 2012 00:17:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 74635E5432
for <gentoo-commits@lists.gentoo.org>; Fri, 29 Jun 2012 00:17:24 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" <pesa@gentoo.org>
Message-ID: <1340927136.e3a63d518b571f545332c6cfbccb31d5e8dac4fb.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
X-VCS-Repository: proj/qt
X-VCS-Files: eclass/qt5-build.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: e3a63d518b571f545332c6cfbccb31d5e8dac4fb
X-VCS-Branch: master
Date: Fri, 29 Jun 2012 00:17:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 300cce64-6170-43a2-9d12-9355fdbaa19c
X-Archives-Hash: 4cb015138bb3ecffe0fc899ea2c95ce5
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=3Dproj/qt.git;a=3Dco=
mmit;h=3De3a63d51
[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 useles=
s,
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=3D${CFLAGS}' 'QMAKE_CXXFLAGS=3D${CXXFLAGS}' 'QMAKE_LFLAG=
S=3D${LDFLAGS}'&:" \
configure || die "sed configure failed"
=20
+ # 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=3D/ s:=3D.*:=3D\"$(tc-getCXX)\":" \
configure || die "sed QMAKE_CONF_COMPILER failed"
@@ -258,8 +262,13 @@ qt5-build_src_configure() {
)
=20
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+=3Dnostrip || die
+
popd >/dev/null || die
=20
qmake() {