| 1 |
commit: e0d4ce2924287149fbb3d135b1096eae7f998168 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 30 16:42:26 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=e0d4ce29 |
| 7 |
|
| 8 |
[dev-qt/qthelp:4] Fix docs generation. |
| 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 | 13 ++++++------- |
| 14 |
3 files changed, 14 insertions(+), 7 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 fe1d048..2525195 100644 |
| 18 |
--- a/dev-qt/qthelp/qthelp-4.8.6.ebuild |
| 19 |
+++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild |
| 20 |
@@ -93,6 +93,10 @@ src_configure() { |
| 21 |
src_compile() { |
| 22 |
qt4-build-multilib_src_compile |
| 23 |
|
| 24 |
+ # qhelpgenerator needs libQtHelp.so.4 |
| 25 |
+ export LD_LIBRARY_PATH=${S}/lib |
| 26 |
+ export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework |
| 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 fe1d048..2525195 100644 |
| 34 |
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild |
| 35 |
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild |
| 36 |
@@ -93,6 +93,10 @@ src_configure() { |
| 37 |
src_compile() { |
| 38 |
qt4-build-multilib_src_compile |
| 39 |
|
| 40 |
+ # qhelpgenerator needs libQtHelp.so.4 |
| 41 |
+ export LD_LIBRARY_PATH=${S}/lib |
| 42 |
+ export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework |
| 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 f36e781..f19980b 100644 |
| 50 |
--- a/eclass/qt4-build-multilib.eclass |
| 51 |
+++ b/eclass/qt4-build-multilib.eclass |
| 52 |
@@ -64,13 +64,6 @@ qt4-build-multilib_pkg_setup() { |
| 53 |
ewarn "Downgrading Qt is completely unsupported and can break your system!" |
| 54 |
ewarn |
| 55 |
fi |
| 56 |
- |
| 57 |
- PATH="${S}/bin${PATH:+:}${PATH}" |
| 58 |
- if [[ ${CHOST} != *-darwin* ]]; then |
| 59 |
- LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" |
| 60 |
- else |
| 61 |
- DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}" |
| 62 |
- fi |
| 63 |
} |
| 64 |
|
| 65 |
# @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES |
| 66 |
@@ -379,6 +372,12 @@ qt4-build-multilib_src_configure() { |
| 67 |
einfo "Configuring with:" ${conf} |
| 68 |
./configure ${conf} || die "configure failed" |
| 69 |
|
| 70 |
+ # configure is stupid and assigns QMAKE_LFLAGS twice, |
| 71 |
+ # thus the previous -rpath-link flag gets overwritten |
| 72 |
+ # and some packages (e.g. qthelp) fail to link |
| 73 |
+ sed -i -e '/^QMAKE_LFLAGS =/ s:$: $$QMAKE_LFLAGS:' \ |
| 74 |
+ .qmake.cache || die "sed .qmake.cache failed" |
| 75 |
+ |
| 76 |
local dir |
| 77 |
for dir in . ${QT4_TARGET_DIRECTORIES}; do |
| 78 |
pushd ${dir} >/dev/null || die |
Archives