commit: 4343235ba4f9fad44e7fc064cce6b216d30f0471 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Feb 22 14:01:24 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Feb 22 14:01:24 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4343235b
[dev-qt/qtwebkit23] Respect *FLAGS etc. Package-Manager: portage-2.2.17 --- dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild index 377a880..10d51a26 100644 --- a/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild +++ b/dev-qt/qtwebkit23/qtwebkit23-2.3.4.ebuild @@ -5,7 +5,7 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) -inherit eutils multilib python-any-r1 +inherit eutils multilib python-any-r1 toolchain-funcs DESCRIPTION="The WebKit module for the Qt toolkit" HOMEPAGE="https://www.qt.io/ https://qt-project.org/"; @@ -60,14 +60,26 @@ DEPEND="${RDEPEND} src_prepare() { # bug 458222 sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die + + sed -i -e "/QMAKE_CXXFLAGS_RELEASE/d" Source/WTF/WTF.pro Source/JavaScriptCore/Target.pri || die } src_compile() { export QTDIR=/usr/$(get_libdir)/qt4/ + export CC=$(tc-getCC) + export CXX=$(tc-getCXX) Tools/Scripts/build-webkit --qt --release --no-webkit2 \ $(use gstreamer || echo --no-video) \ --makeargs="${MAKEOPTS}" \ - --qmakearg="CONFIG+=production_build CONFIG+=nostrip" || die + --qmakearg="CONFIG+=production_build CONFIG+=nostrip" \ + QMAKE_CC=\"$(tc-getCC)\" \ + QMAKE_CXX=\"$(tc-getCXX)\" \ + QMAKE_CFLAGS=\"${CFLAGS}\" \ + QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \ + QMAKE_CFLAGS_RELEASE=\"\" \ + QMAKE_CXXFLAGS_RELEASE=\"\" \ + QMAKE_LFLAGS+=\"${LDFLAGS}\" \ + QMAKE_LINK=\"$(tc-getCXX)\" || die } src_install() {
