commit: f4aa5216a0b71858e2cefc6aed4bbf72cf8aa303
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 03:33:36 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 03:33:36 2015 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4aa5216
qt5-build.eclass: define QT5_BUILD_DIR after QT5_BUILD_TYPE
Since the latter is required by the former. Fixes regression
in commit 4b70a2ea5396afc14f018bb3429be4a89d8f1ecf.
eclass/qt5-build.eclass | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7ad8cf4..8ee1cd7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -23,14 +23,6 @@ esac
# SRC_URI and EGIT_REPO_URI. Must be defined before inheriting the eclass.
: ${QT5_MODULE:=${PN}}
-# @ECLASS-VARIABLE: QT5_BUILD_DIR
-# @DESCRIPTION:
-# Build directory for out-of-source builds.
-case ${QT5_BUILD_TYPE} in
- live) : ${QT5_BUILD_DIR:=${S}_build} ;;
- release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
-esac
-
# @ECLASS-VARIABLE: QT5_TARGET_SUBDIRS
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -103,6 +95,14 @@ EGIT_REPO_URI=(
)
[[ ${QT5_BUILD_TYPE} == live ]] && inherit git-r3
+# @ECLASS-VARIABLE: QT5_BUILD_DIR
+# @DESCRIPTION:
+# Build directory for out-of-source builds.
+case ${QT5_BUILD_TYPE} in
+ live) : ${QT5_BUILD_DIR:=${S}_build} ;;
+ release) : ${QT5_BUILD_DIR:=${S}} ;; # workaround for bug 497312
+esac
+
IUSE="debug test"
[[ ${PN} == qtwebkit ]] && RESTRICT+=" mirror" # bug 524584
