From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C32DD1381FA for ; Wed, 4 Jun 2014 00:14:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C07B2E0B1B; Wed, 4 Jun 2014 00:14:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16A36E0B0C for ; Wed, 4 Jun 2014 00:14:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F014433F65A for ; Wed, 4 Jun 2014 00:13:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 2BDCA182D4 for ; Wed, 4 Jun 2014 00:13:57 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1401839938.c904e3ec4ca104d03df8171bd628e11510982c43.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: c904e3ec4ca104d03df8171bd628e11510982c43 X-VCS-Branch: master Date: Wed, 4 Jun 2014 00:13:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0ecfe79f-7540-44c9-8827-38b129cfef74 X-Archives-Hash: 8b0d07d2e2626d8692d1f9acba157f64 commit: c904e3ec4ca104d03df8171bd628e11510982c43 Author: Davide Pesavento gentoo org> AuthorDate: Tue Jun 3 23:58:58 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jun 3 23:58:58 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c904e3ec [qt4-build-multilib.eclass] Use -dont-process rather than patching configure. --- eclass/qt4-build-multilib.eclass | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 5eef7f7..42e1097 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -107,13 +107,15 @@ qt4-build-multilib_src_unpack() { # the build system in order to respect CFLAGS/CXXFLAGS/LDFLAGS specified in make.conf. qt4-build-multilib_src_prepare() { if [[ ${PN} != qtcore ]]; then - skip_qmake_build - skip_project_generation + # avoid unnecessary qmake recompilations + sed -i -e 's/^if true;/if false;/' configure \ + || die "sed failed (skip qmake bootstrap)" fi # skip X11 tests in non-gui packages to avoid spurious dependencies if has ${PN} qtbearer qtcore qtdbus qtscript qtsql qttest qttranslations qtxmlpatterns; then - sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure || die + sed -i -e '/^if.*PLATFORM_X11.*CFG_GUI/,/^fi$/d' configure \ + || die "sed failed (skip X11 tests)" fi if use_if_iuse aqua; then @@ -297,6 +299,10 @@ multilib_src_configure() { fi conf+=" -no-separate-debug-info" + # skip recursive processing of .pro files at the end of configure + # (we run qmake by ourselves), thus saving quite a bit of time + conf+=" -dont-process" + # exceptions USE flag conf+=" $(in_iuse exceptions && qt_use exceptions || echo -exceptions)" @@ -603,22 +609,6 @@ generate_qconfigs() { fi } -# @FUNCTION: skip_qmake_build -# @INTERNAL -# @DESCRIPTION: -# Patches configure to skip qmake compilation, as it's already installed by qtcore. -skip_qmake_build() { - sed -i -e "s:if true:if false:g" "${S}"/configure || die -} - -# @FUNCTION: skip_project_generation -# @INTERNAL -# @DESCRIPTION: -# Exit the script early by throwing in an exit before all of the .pro files are scanned. -skip_project_generation() { - sed -i -e "s:echo \"Finding:exit 0\n\necho \"Finding:g" "${S}"/configure || die -} - # @FUNCTION: qt4_symlink_tools_to_build_dir # @INTERNAL # @DESCRIPTION: