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 CACBD138A2F for ; Tue, 19 Aug 2014 01:16:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C340E09B1; Tue, 19 Aug 2014 01:16:50 +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 0DC84E09B1 for ; Tue, 19 Aug 2014 01:16:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B676340099 for ; Tue, 19 Aug 2014 01:16:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4801B3B7C for ; Tue, 19 Aug 2014 01:07:18 +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: <1408062627.4a8ca10b657ed9a267470924b56efa235b34f679.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: 4a8ca10b657ed9a267470924b56efa235b34f679 X-VCS-Branch: master Date: Tue, 19 Aug 2014 01:07:18 +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: eb507465-fdbc-42dc-a359-403b6aa5e52d X-Archives-Hash: 68500e941b92bac2193f2a1e4630aba8 Message-ID: <20140819010718.iGc27ZRopqscwatHcgL9QO7Lr_CRIWBsCopkSQFs1m8@z> commit: 4a8ca10b657ed9a267470924b56efa235b34f679 Author: Davide Pesavento gentoo org> AuthorDate: Fri Aug 15 00:21:20 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Aug 15 00:30:27 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4a8ca10b [qt5-build.eclass] Minor refactoring. --- eclass/qt5-build.eclass | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 1e053ea..10f1586 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -209,20 +209,11 @@ qt5-build_src_prepare() { # @DESCRIPTION: # Runs qmake, possibly preceded by ./configure. qt5-build_src_configure() { - mkdir -p "${QT5_BUILD_DIR}" || die - pushd "${QT5_BUILD_DIR}" >/dev/null || die - if [[ ${QT5_MODULE} == qtbase ]]; then - # toolchain setup - tc-export CC CXX RANLIB STRIP - export LD="$(tc-getCXX)" - qt5_base_configure fi qt5_foreach_target_subdir qt5_qmake - - popd >/dev/null || die } # @FUNCTION: qt5-build_src_compile @@ -446,6 +437,10 @@ qt5_symlink_tools_to_build_dir() { # @DESCRIPTION: # Runs ./configure for modules belonging to qtbase. qt5_base_configure() { + # setup toolchain variables used by configure + tc-export CC CXX RANLIB STRIP + export LD="$(tc-getCXX)" + # configure arguments local conf=( # installation paths @@ -590,8 +585,13 @@ qt5_base_configure() { "${myconf[@]}" ) + mkdir -p "${QT5_BUILD_DIR}" || die + pushd "${QT5_BUILD_DIR}" >/dev/null || die + einfo "Configuring with: ${conf[@]}" "${S}"/configure "${conf[@]}" || die "configure failed" + + popd >/dev/null || die } # @FUNCTION: qt5_qmake