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

[Davide Pesavento]

commit:     fb38b1da22ef21f32e3d659b8287715cce0bf6f8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 19:14:01 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 19:14:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=fb38b1da

[qt5-build] Allow configuring debug/release on a per-package basis.

Partially based on github pull request #92.

 eclass/qt5-build.eclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 6f10824..5bc5cbd 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -489,8 +489,9 @@ qt5_base_configure() {
                -examplesdir "${QT5_EXAMPLESDIR}"
                -testsdir "${QT5_TESTSDIR}"
 
-               # debug/release
-               $(usex debug -debug -release)
+               # configure in release mode by default,
+               # override via the CONFIG qmake variable
+               -release
                -no-separate-debug-info
 
                # licensing stuff
@@ -649,6 +650,8 @@ qt5_qmake() {
        fi
 
        "${qmakepath}"/qmake \
+               CONFIG+=$(usex debug debug release) \
+               CONFIG-=$(usex debug release debug) \
                QMAKE_AR="$(tc-getAR) cqs" \
                QMAKE_CC="$(tc-getCC)" \
                QMAKE_LINK_C="$(tc-getCC)" \