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 CC1AD1381FA for ; Sun, 1 Jun 2014 02:41:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9616E0829; Sun, 1 Jun 2014 02:41:37 +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 E512EE0829 for ; Sun, 1 Jun 2014 02:41:36 +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 DB18733FEC0 for ; Sun, 1 Jun 2014 02:41:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 31442182D6 for ; Sun, 1 Jun 2014 02:41:34 +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: <1401590396.3c86bbc62eb9fb28883d6c4eb8161ac70e0f8180.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qthelp/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qthelp/qthelp-4.8.6.ebuild dev-qt/qthelp/qthelp-4.8.9999.ebuild eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ dev-qt/qthelp/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 3c86bbc62eb9fb28883d6c4eb8161ac70e0f8180 X-VCS-Branch: master Date: Sun, 1 Jun 2014 02:41:34 +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: 44136a88-12c6-4f81-8bdb-42ae6b389534 X-Archives-Hash: 00072bb47ae47329f3d71ee750556841 commit: 3c86bbc62eb9fb28883d6c4eb8161ac70e0f8180 Author: Davide Pesavento gentoo org> AuthorDate: Thu May 29 22:40:19 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Jun 1 02:39:56 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3c86bbc6 [qt4-build-multilib.eclass] Always run qmake in the build tree root. --- dev-qt/qthelp/qthelp-4.8.6.ebuild | 4 ---- dev-qt/qthelp/qthelp-4.8.9999.ebuild | 4 ---- eclass/qt4-build-multilib.eclass | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild index ff5f20b..fe1d048 100644 --- a/dev-qt/qthelp/qthelp-4.8.6.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild @@ -93,10 +93,6 @@ src_configure() { src_compile() { qt4-build-multilib_src_compile - # this generates a top-level Makefile containing the targets - # used below to build and install the documentation - "${S}"/bin/qmake || die - if use doc; then emake docs elif [[ ${QT4_BUILD_TYPE} == release ]]; then diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild index ff5f20b..fe1d048 100644 --- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild @@ -93,10 +93,6 @@ src_configure() { src_compile() { qt4-build-multilib_src_compile - # this generates a top-level Makefile containing the targets - # used below to build and install the documentation - "${S}"/bin/qmake || die - if use doc; then emake docs elif [[ ${QT4_BUILD_TYPE} == release ]]; then diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index af90b06..f36e781 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -380,7 +380,7 @@ qt4-build-multilib_src_configure() { ./configure ${conf} || die "configure failed" local dir - for dir in ${QT4_TARGET_DIRECTORIES}; do + for dir in . ${QT4_TARGET_DIRECTORIES}; do pushd ${dir} >/dev/null || die einfo "Running qmake in: ${dir}" "${S}"/bin/qmake \