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 0BC1B138A2F for ; Fri, 29 Aug 2014 23:01:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CECCE0B61; Fri, 29 Aug 2014 23:01:23 +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 2C5ABE0B61 for ; Fri, 29 Aug 2014 23:01:23 +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 CCB3033BE9D for ; Fri, 29 Aug 2014 23:01:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 751D64345 for ; Fri, 29 Aug 2014 23:01:20 +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: <1409353040.279a71a89cea2e9774cf6d465f05e5c82709bc2e.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: 279a71a89cea2e9774cf6d465f05e5c82709bc2e X-VCS-Branch: master Date: Fri, 29 Aug 2014 23:01:20 +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: 3fef8cb9-e253-44aa-8685-593194fc9e38 X-Archives-Hash: 20e39ce4c6dd3167641421df6e13614d commit: 279a71a89cea2e9774cf6d465f05e5c82709bc2e Author: Davide Pesavento gentoo org> AuthorDate: Fri Aug 29 22:57:20 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Fri Aug 29 22:57:20 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=279a71a8 [qt5-build.eclass] Make qt5_symlink_tools_to_build_dir() slightly smarter. With the new behavior, we no longer symlink the tools that are about to be built. For example, uic is not symlinked when emerging qtwidgets. --- eclass/qt5-build.eclass | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 226c17a..596e4bd 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -423,16 +423,23 @@ qt5_foreach_target_subdir() { # Symlinks qmake and a few other tools to QT5_BUILD_DIR, # so that they can be used when building other modules. qt5_symlink_tools_to_build_dir() { - mkdir -p "${QT5_BUILD_DIR}"/bin || die + local tool= tools=() + if [[ ${PN} != qtcore ]]; then + tools+=(qmake moc rcc qlalr) + [[ ${PN} != qdoc ]] && tools+=(qdoc) + [[ ${PN} != qtdbus ]] && tools+=(qdbuscpp2xml qdbusxml2cpp) + [[ ${PN} != qtwidgets ]] && tools+=(uic) + fi - [[ ${PN} == qtcore ]] && return + mkdir -p "${QT5_BUILD_DIR}"/bin || die + pushd "${QT5_BUILD_DIR}"/bin >/dev/null || die - local bin - for bin in "${QT5_BINDIR}"/{qmake,moc,rcc,qlalr,uic,qdbuscpp2xml,qdbusxml2cpp,qdoc}; do - if [[ -e ${bin} ]]; then - ln -s "${bin}" "${QT5_BUILD_DIR}"/bin || die "failed to symlink ${bin}" - fi + for tool in "${tools[@]}"; do + [[ -e ${QT5_BINDIR}/${tool} ]] || continue + ln -s "${QT5_BINDIR}/${tool}" . || die "failed to symlink ${tool}" done + + popd >/dev/null || die } # @FUNCTION: qt5_base_configure