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

[Davide Pesavento]

commit:     a2e19063055abeb65097dae9e1e6b4ee881f6367
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 13 12:43:07 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Oct 13 12:43:07 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a2e19063

[qt4-build-multilib.eclass] Create qconfigs in separate directories

Create qconfig files in ${BUILD_DIR} rather than ${T} since the former
location is separate for different ABIs. This solves the issue of
installing the concatenated qconfig for two consecutive ABIs without
introducing race conditions.

---
 eclass/qt4-build-multilib.eclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 876eb94..338e050 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -554,18 +554,18 @@ install_qconfigs() {
        local x
        if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
                for x in QCONFIG_ADD QCONFIG_REMOVE; do
-                       [[ -n ${!x} ]] && echo ${x}=${!x} >> 
"${T}"/${PN}-qconfig.pri
+                       [[ -n ${!x} ]] && echo ${x}=${!x} >> 
"${BUILD_DIR}"/${PN}-qconfig.pri
                done
                insinto ${QT4_DATADIR#${EPREFIX}}/mkspecs/gentoo
-               doins "${T}"/${PN}-qconfig.pri
+               doins "${BUILD_DIR}"/${PN}-qconfig.pri
        fi
 
        if [[ -n ${QCONFIG_DEFINE} ]]; then
                for x in ${QCONFIG_DEFINE}; do
-                       echo "#define ${x}" >> "${T}"/gentoo-${PN}-qconfig.h
+                       echo "#define ${x}" >> 
"${BUILD_DIR}"/gentoo-${PN}-qconfig.h
                done
                insinto ${QT4_HEADERDIR#${EPREFIX}}/Gentoo
-               doins "${T}"/gentoo-${PN}-qconfig.h
+               doins "${BUILD_DIR}"/gentoo-${PN}-qconfig.h
        fi
 }