summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2010-01-14 18:35:05 +0000
committerJonathan Callen <abcd@gentoo.org>2010-01-14 18:35:05 +0000
commit5388e1d32171295ea92e2724849f222ae01db486 (patch)
tree898f727234c6791f77efd52a6a52bd8348e19d82 /x11-libs/qt-assistant
parentTransfer Prefix keywords (diff)
downloadgentoo-2-5388e1d32171295ea92e2724849f222ae01db486.tar.gz
gentoo-2-5388e1d32171295ea92e2724849f222ae01db486.tar.bz2
gentoo-2-5388e1d32171295ea92e2724849f222ae01db486.zip
Build fix for Mac OS X
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'x11-libs/qt-assistant')
-rw-r--r--x11-libs/qt-assistant/ChangeLog8
-rw-r--r--x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild7
2 files changed, 10 insertions, 5 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 9aaecaf7f9fb..46f388574d03 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qt-assistant
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.64 2009/12/25 15:33:39 abcd Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.65 2010/01/14 18:35:05 abcd Exp $
+
+ 14 Jan 2010; Jonathan Callen <abcd@gentoo.org>
+ qt-assistant-4.6.0-r1.ebuild:
+ Build fix for Mac OS X
*qt-assistant-4.6.0-r1 (25 Dec 2009)
diff --git a/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild
index f217fea3f4c9..3eebc0f34614 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild,v 1.1 2009/12/25 15:33:39 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.6.0-r1.ebuild,v 1.2 2010/01/14 18:35:05 abcd Exp $
EAPI="2"
inherit qt4-build
@@ -46,7 +46,8 @@ src_configure() {
src_compile() {
# help libQtHelp find freshly built libQtCLucene (bug #289811)
- export LD_LIBRARY_PATH="${S}/lib" DYLD_LIBRARY_PATH="${S}/lib"
+ export LD_LIBRARY_PATH="${S}/lib"
+ export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
qt4-build_src_compile
# ugly hack to build docs
cd "${S}"