From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 44C361381FA for ; Tue, 27 May 2014 10:49:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C34CDE07F9; Tue, 27 May 2014 10:49:00 +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 35CA6E07F5 for ; Tue, 27 May 2014 10:49:00 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5394833FD21 for ; Tue, 27 May 2014 10:48:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 05707182D4 for ; Tue, 27 May 2014 10:48:58 +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: <1401147895.1c01ff4e90283b0f9e286d2953a0e12a13840026.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: 1c01ff4e90283b0f9e286d2953a0e12a13840026 X-VCS-Branch: master Date: Tue, 27 May 2014 10:48:58 +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: 53dc39e6-6556-4410-a4cc-b0055b9d7f73 X-Archives-Hash: 867f528b81b3641a68f7780d159eade3 commit: 1c01ff4e90283b0f9e286d2953a0e12a13840026 Author: Davide Pesavento gentoo org> AuthorDate: Mon May 26 23:44:55 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon May 26 23:44:55 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1c01ff4e [qt4-build-multilib.eclass] Get rid of install_directories(). --- eclass/qt4-build-multilib.eclass | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index acf3166..dd919f9 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -415,7 +415,7 @@ qt4-build-multilib_src_compile() { # @FUNCTION: qt4-build-multilib_src_test # @DESCRIPTION: -# Runs tests only in target directories. +# Runs unit tests in all QT4_TARGET_DIRECTORIES. qt4-build-multilib_src_test() { # QtMultimedia does not have any test suite (bug #332299) [[ ${PN} == qtmultimedia ]] && return @@ -428,9 +428,16 @@ qt4-build-multilib_src_test() { # @FUNCTION: qt4-build-multilib_src_install # @DESCRIPTION: -# Perform the actual installation including some library fixes. +# Performs the actual installation, running 'emake install' +# inside all QT4_TARGET_DIRECTORIES, and installing qconfigs. qt4-build-multilib_src_install() { - install_directories ${QT4_TARGET_DIRECTORIES} + local dir + for dir in ${QT4_TARGET_DIRECTORIES}; do + pushd ${dir} >/dev/null || die + emake INSTALL_ROOT="${D}" install + popd >/dev/null || die + done + install_qconfigs fix_library_files fix_includes @@ -495,19 +502,6 @@ qt4_prepare_env() { export XDG_CONFIG_HOME="${T}" } -# @FUNCTION: install_directories -# @USAGE: < directories > -# @INTERNAL -# @DESCRIPTION: -# Runs emake install in the given directories, which are separated by spaces. -install_directories() { - for x in "$@"; do - pushd "${S}"/${x} >/dev/null || die - emake INSTALL_ROOT="${D}" install - popd >/dev/null || die - done -} - # @ECLASS-VARIABLE: QCONFIG_ADD # @DESCRIPTION: # List options that need to be added to QT_CONFIG in qconfig.pri