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 8C72E13877A for ; Sun, 29 Jun 2014 00:51:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BF69E0A80; Sun, 29 Jun 2014 00:51: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 CB8A2E0A80 for ; Sun, 29 Jun 2014 00:51:42 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [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 BA5E734016E for ; Sun, 29 Jun 2014 00:51:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id F3594192CD for ; Sun, 29 Jun 2014 00:51:39 +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: <1404003076.8b3e9c1290a659128adb0f4bbc323ba39413522c.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: 8b3e9c1290a659128adb0f4bbc323ba39413522c X-VCS-Branch: master Date: Sun, 29 Jun 2014 00:51:39 +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: 6c6ec1d7-c340-4dd4-976b-84d331a50486 X-Archives-Hash: d4879c62433f026a060f5ba33e02aa4b commit: 8b3e9c1290a659128adb0f4bbc323ba39413522c Author: Davide Pesavento gentoo org> AuthorDate: Sun Jun 29 00:50:42 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Jun 29 00:51:16 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8b3e9c12 [qt4-build-multilib] Do common stuff in multilib_src_install_all(). --- eclass/qt4-build-multilib.eclass | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 6b34c46..71ae1b3 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -415,7 +415,7 @@ multilib_src_test() { # @FUNCTION: qt4-build-multilib_src_install # @DESCRIPTION: # Performs the actual installation, running 'emake install' -# inside all QT4_TARGET_DIRECTORIES, and installing qconfigs. +# in all QT4_TARGET_DIRECTORIES, and installing qconfigs. qt4-build-multilib_src_install() { multilib-minimal_src_install } @@ -430,6 +430,19 @@ multilib_src_install() { emake INSTALL_ROOT="${D}" install_{mkspecs,qmake} fi + install_qconfigs + fix_library_files + fix_includes +} + +multilib_src_install_all() { + qt4-build-multilib_src_install_all +} + +# @FUNCTION: qt4-build-multilib_src_install_all +# @DESCRIPTION: +# Common install phase for all multilib ABIs. +qt4-build-multilib_src_install_all() { # install private headers of a few modules if has ${PN} qtcore qtdeclarative qtgui qtscript; then local moduledir=${PN#qt} @@ -441,10 +454,6 @@ multilib_src_install() { find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die fi - install_qconfigs - fix_library_files - fix_includes - # remove .la files since we are building only shared libraries prune_libtool_files }