From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-737933-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 31A44138247
for <garchives@archives.gentoo.org>; Mon, 13 Oct 2014 19:35:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BDCA4E09E9;
Mon, 13 Oct 2014 19:35:43 +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 4EF53E09E9
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Oct 2014 19:35:43 +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 2627E340436
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Oct 2014 19:35:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 978BA7C25
for <gentoo-commits@lists.gentoo.org>; Mon, 13 Oct 2014 19:35:39 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
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" <pesa@gentoo.org>
Message-ID: <1413204187.a2e19063055abeb65097dae9e1e6b4ee881f6367.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
X-VCS-Repository: proj/qt
X-VCS-Files: eclass/qt4-build-multilib.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: a2e19063055abeb65097dae9e1e6b4ee881f6367
X-VCS-Branch: master
Date: Mon, 13 Oct 2014 19:35:39 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: fbf2f1ca-4769-4c99-9d9e-79f3df1ebdba
X-Archives-Hash: 654274eaf026802a9a2ac3b9a592ce46
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
}