From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 381BF1381F3 for ; Mon, 19 Nov 2012 03:51:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D25F21C1A4; Mon, 19 Nov 2012 03:51:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6E8C21C1A4 for ; Mon, 19 Nov 2012 03:51:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8806D33D74E for ; Mon, 19 Nov 2012 03:51:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 13F14E5442 for ; Mon, 19 Nov 2012 03:51:06 +0000 (UTC) From: "Davide Pesavento" 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" Message-ID: <1353297017.953cfacac6a1763600db33a97681cc81bfa1ccdf.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 953cfacac6a1763600db33a97681cc81bfa1ccdf X-VCS-Branch: master Date: Mon, 19 Nov 2012 03:51:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 05725004-ba9d-47a6-b29f-7e79f63e3dbc X-Archives-Hash: cb2ef23c59beb475d02c1fc1ac4226cb commit: 953cfacac6a1763600db33a97681cc81bfa1ccdf Author: Davide Pesavento gmail com> AuthorDate: Mon Nov 19 03:50:17 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Nov 19 03:50:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=953cfaca [qt5-build.eclass] Refactoring and cleanup. --- eclass/qt5-build.eclass | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 7006406..a2e8e01 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -40,7 +40,6 @@ case ${PN#qt-} in esac case ${QT5_BUILD_TYPE} in live) - MY_P=${P} EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git https://git.gitorious.org/qt/${EGIT_PROJECT}.git" ;; @@ -61,7 +60,7 @@ if [[ ${PN} != "qt-test" ]]; then DEPEND+=" test? ( ~x11-libs/qt-test-${PV}[debug=] )" fi -S=${WORKDIR}/${MY_P} +S=${WORKDIR}/${EGIT_PROJECT} # @ECLASS-VARIABLE: PATCHES # @DEFAULT_UNSET @@ -87,7 +86,7 @@ S=${WORKDIR}/${MY_P} # @ECLASS-VARIABLE: QT5_BUILD_DIR # @DESCRIPTION: # Build directory for out-of-source builds. -: ${QT5_BUILD_DIR:=${WORKDIR}/${MY_P}_build} +: ${QT5_BUILD_DIR:=${WORKDIR}/${EGIT_PROJECT}_build} # @ECLASS-VARIABLE: QT5_VERBOSE_BUILD # @DESCRIPTION: @@ -149,6 +148,7 @@ qt5-build_src_unpack() { ;; release) default + mv "${MY_P}" "${EGIT_PROJECT}" || die ;; esac } @@ -159,8 +159,6 @@ qt5-build_src_unpack() { qt5-build_src_prepare() { qt5_prepare_env - mkdir -p "${QT5_BUILD_DIR}" || die - if [[ ${EGIT_PROJECT} == "qtbase" ]]; then # Avoid unnecessary qmake recompilations sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ @@ -216,6 +214,7 @@ qt5-build_src_configure() { # qmake-generated Makefiles use LD/LINK for linking export LD="$(tc-getCXX)" + mkdir -p "${QT5_BUILD_DIR}" || die pushd "${QT5_BUILD_DIR}" > /dev/null || die if [[ ${EGIT_PROJECT} == "qtbase" ]]; then @@ -445,12 +444,8 @@ qt5_base_configure() { # Helper function that runs qmake in the current target subdir. # Intended to be called by qt5_foreach_target_subdir(). qt5_qmake() { - local projectfile=${S}/ - if [[ -n ${subdir} ]]; then - projectfile+=${subdir}/${subdir##*/}.pro - else - projectfile+=${EGIT_PROJECT}.pro - fi + local projectdir=${PWD/#${QT5_BUILD_DIR}/${S}} + local projectfile=${projectdir}/${projectdir##*/}.pro "${QT5_BUILD_DIR}"/bin/qmake "${projectfile}" \ || die "qmake failed (${projectfile})"