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

[Davide Pesavento]

commit:     4a8ca10b657ed9a267470924b56efa235b34f679
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 00:21:20 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 00:30:27 2014 +0000
URL:        
http://git.overlays.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