From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qthelp/
Date: Sun, 1 Jun 2014 02:41:34 +0000 (UTC) [thread overview]
Message-ID: <1401590396.3c86bbc62eb9fb28883d6c4eb8161ac70e0f8180.pesa@gentoo> (raw)
commit: 3c86bbc62eb9fb28883d6c4eb8161ac70e0f8180
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 22:40:19 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> 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 \
next reply other threads:[~2014-06-01 2:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-01 2:41 Davide Pesavento [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-06-01 2:41 [gentoo-commits] proj/qt:master commit in: eclass/, dev-qt/qthelp/ Davide Pesavento
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401590396.3c86bbc62eb9fb28883d6c4eb8161ac70e0f8180.pesa@gentoo \
--to=pesa@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox