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.77) (envelope-from ) id 1SohIh-00043x-Vh for garchives@archives.gentoo.org; Tue, 10 Jul 2012 20:44:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6B41E09EE; Tue, 10 Jul 2012 20:44:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B95C6E09EE for ; Tue, 10 Jul 2012 20:44:34 +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 28F8B1B4019 for ; Tue, 10 Jul 2012 20:44:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DF5F6E5433 for ; Tue, 10 Jul 2012 20:44:32 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1341942264.1f9f7707b3dda732c4f04a675d3677c03b7c5840.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: 1f9f7707b3dda732c4f04a675d3677c03b7c5840 X-VCS-Branch: master Date: Tue, 10 Jul 2012 20:44:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3b69ae36-785c-4932-85c5-52f96e064824 X-Archives-Hash: 59bc613983f416d1a4618d27564b067d commit: 1f9f7707b3dda732c4f04a675d3677c03b7c5840 Author: Davide Pesavento gmail com> AuthorDate: Tue Jul 10 17:03:04 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jul 10 17:44:24 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D1f9f7707 [qt5-build.eclass] Speed up the recursive qmake invocation in src_configu= re(). --- eclass/qt5-build.eclass | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 23cf40a..3b14330 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -187,18 +187,18 @@ qt5-build_src_prepare() { configure || die "sed QMAKE_CONF_COMPILER failed" =20 # Respect CC, CXX, LINK and *FLAGS in config.tests + # FIXME: in compile.test, -m flags are passed to the linker via LIBS find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=3D: \ 'QMAKE_CC=3D$(tc-getCC)' 'QMAKE_CXX=3D$(tc-getCXX)' 'QMAKE_LI= NK=3D$(tc-getCXX)' \ 'QMAKE_CFLAGS+=3D${CFLAGS}' 'QMAKE_CXXFLAGS+=3D${CXXFLAGS}' 'QMAKE_LF= LAGS+=3D${LDFLAGS}'&:" \ || die "sed config.tests failed" =20 - # TODO - # in compile.test, -m flags are passed to the linker via LIBS + # Remove unused project files to speed up recursive qmake invocation + rm -f demos/demos.pro examples/examples.pro tests/tests.pro tools/tools= .pro =20 tc-export CC CXX RANLIB STRIP - # qmake-generated Makefiles use LD/LINK for linking - export LD=3D"$(tc-getCXX)" + export LD=3D"$(tc-getCXX)" # qmake-generated Makefiles use LD/LINK for = linking =20 base_src_prepare } @@ -237,11 +237,13 @@ qt5-build_src_configure() { -shared -dont-process -pkg-config + + # prefer system libraries -system-zlib -system-pcre =20 - # don't build examples - -nomake examples + # exclude examples and tests from building + -make libs =20 # disable rpath on non-prefix (bugs 380415 and 417169) $(use prefix || echo -no-rpath)