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 7AC421381FA for ; Sun, 1 Jun 2014 02:41:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43423E0830; Sun, 1 Jun 2014 02:41:39 +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 84D2AE0830 for ; Sun, 1 Jun 2014 02:41:38 +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 ABB6C33FE79 for ; Sun, 1 Jun 2014 02:41:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 69D19182D8 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.e0d4ce2924287149fbb3d135b1096eae7f998168.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: e0d4ce2924287149fbb3d135b1096eae7f998168 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: cb8d5b99-7896-408d-9f6f-da862f37593c X-Archives-Hash: a04a76780c193153b95319c8a5083675 commit: e0d4ce2924287149fbb3d135b1096eae7f998168 Author: Davide Pesavento gentoo org> AuthorDate: Fri May 30 16:42:26 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=e0d4ce29 [dev-qt/qthelp:4] Fix docs generation. --- dev-qt/qthelp/qthelp-4.8.6.ebuild | 4 ++++ dev-qt/qthelp/qthelp-4.8.9999.ebuild | 4 ++++ eclass/qt4-build-multilib.eclass | 13 ++++++------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dev-qt/qthelp/qthelp-4.8.6.ebuild b/dev-qt/qthelp/qthelp-4.8.6.ebuild index fe1d048..2525195 100644 --- a/dev-qt/qthelp/qthelp-4.8.6.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.6.ebuild @@ -93,6 +93,10 @@ src_configure() { src_compile() { qt4-build-multilib_src_compile + # qhelpgenerator needs libQtHelp.so.4 + export LD_LIBRARY_PATH=${S}/lib + export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework + 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 fe1d048..2525195 100644 --- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild @@ -93,6 +93,10 @@ src_configure() { src_compile() { qt4-build-multilib_src_compile + # qhelpgenerator needs libQtHelp.so.4 + export LD_LIBRARY_PATH=${S}/lib + export DYLD_LIBRARY_PATH=${S}/lib:${S}/lib/QtHelp.framework + 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 f36e781..f19980b 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -64,13 +64,6 @@ qt4-build-multilib_pkg_setup() { ewarn "Downgrading Qt is completely unsupported and can break your system!" ewarn fi - - PATH="${S}/bin${PATH:+:}${PATH}" - if [[ ${CHOST} != *-darwin* ]]; then - LD_LIBRARY_PATH="${S}/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" - else - DYLD_LIBRARY_PATH="${S}/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}" - fi } # @ECLASS-VARIABLE: QT4_EXTRACT_DIRECTORIES @@ -379,6 +372,12 @@ qt4-build-multilib_src_configure() { einfo "Configuring with:" ${conf} ./configure ${conf} || die "configure failed" + # configure is stupid and assigns QMAKE_LFLAGS twice, + # thus the previous -rpath-link flag gets overwritten + # and some packages (e.g. qthelp) fail to link + sed -i -e '/^QMAKE_LFLAGS =/ s:$: $$QMAKE_LFLAGS:' \ + .qmake.cache || die "sed .qmake.cache failed" + local dir for dir in . ${QT4_TARGET_DIRECTORIES}; do pushd ${dir} >/dev/null || die