| 1 |
commit: 3c86bbc62eb9fb28883d6c4eb8161ac70e0f8180 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 29 22:40:19 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 1 02:39:56 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3c86bbc6 |
| 7 |
|
| 8 |
[qt4-build-multilib.eclass] Always run qmake in the build tree root. |
| 9 |
|
| 10 |
--- |
| 11 |
dev-qt/qthelp/qthelp-4.8.6.ebuild | 4 ---- |
| 12 |
dev-qt/qthelp/qthelp-4.8.9999.ebuild | 4 ---- |
| 13 |
eclass/qt4-build-multilib.eclass | 2 +- |
| 14 |
3 files changed, 1 insertion(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild |
| 17 |
index ff5f20b..fe1d048 100644 |
| 18 |
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild |
| 19 |
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild |
| 20 |
@@ -93,10 +93,6 @@ src_configure() { |
| 21 |
src_compile() { |
| 22 |
qt4-build-multilib_src_compile |
| 23 |
|
| 24 |
- # this generates a top-level Makefile containing the targets |
| 25 |
- # used below to build and install the documentation |
| 26 |
- "${S}"/bin/qmake || die |
| 27 |
- |
| 28 |
if use doc; then |
| 29 |
emake docs |
| 30 |
elif [[ ${QT4_BUILD_TYPE} == release ]]; then |
| 31 |
|
| 32 |
diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild |
| 33 |
index ff5f20b..fe1d048 100644 |
| 34 |
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild |
| 35 |
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild |
| 36 |
@@ -93,10 +93,6 @@ src_configure() { |
| 37 |
src_compile() { |
| 38 |
qt4-build-multilib_src_compile |
| 39 |
|
| 40 |
- # this generates a top-level Makefile containing the targets |
| 41 |
- # used below to build and install the documentation |
| 42 |
- "${S}"/bin/qmake || die |
| 43 |
- |
| 44 |
if use doc; then |
| 45 |
emake docs |
| 46 |
elif [[ ${QT4_BUILD_TYPE} == release ]]; then |
| 47 |
|
| 48 |
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass |
| 49 |
index af90b06..f36e781 100644 |
| 50 |
--- a/eclass/qt4-build-multilib.eclass |
| 51 |
+++ b/eclass/qt4-build-multilib.eclass |
| 52 |
@@ -380,7 +380,7 @@ qt4-build-multilib_src_configure() { |
| 53 |
./configure ${conf} || die "configure failed" |
| 54 |
|
| 55 |
local dir |
| 56 |
- for dir in ${QT4_TARGET_DIRECTORIES}; do |
| 57 |
+ for dir in . ${QT4_TARGET_DIRECTORIES}; do |
| 58 |
pushd ${dir} >/dev/null || die |
| 59 |
einfo "Running qmake in: ${dir}" |
| 60 |
"${S}"/bin/qmake \ |
Archives