diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-12-22 03:57:14 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-12-22 03:57:14 +0000 |
| commit | b6946932f383271fc4e340ff204d81430b272a4c (patch) | |
| tree | 0de259fffd59135d1cee43363a6687658209a51a /eclass | |
| parent | Bug #439188: Absolutely ridiculous workaround for upstream glibc/kernel heade... (diff) | |
| download | gentoo-2-b6946932f383271fc4e340ff204d81430b272a4c.tar.gz gentoo-2-b6946932f383271fc4e340ff204d81430b272a4c.tar.bz2 gentoo-2-b6946932f383271fc4e340ff204d81430b272a4c.zip | |
Tweak sed expression to match against Qt 4.8.4 too. Thanks to Tomasz Mloduchowski <q@qdot.me> for spotting the regression.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/qt4-build.eclass | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 01598e4a7315..8499521e8bf6 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.573 2012/12/20 23:36:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.574 2012/12/22 03:57:14 pesa Exp $ + + 22 Dec 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass: + Tweak sed expression to match against Qt 4.8.4 too. Thanks to Tomasz + Mloduchowski <q@qdot.me> for spotting the regression. 20 Dec 2012; Michał Górny <mgorny@gentoo.org> python-single-r1.eclass: Introduce python_fix_shebang(), to fix shebangs in installed Python scripts diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index 75891851f8cd..9dbac1d79368 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.139 2012/11/12 09:28:53 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.140 2012/12/22 03:57:14 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -274,7 +274,7 @@ qt4-build_src_prepare() { # Respect CC, CXX, LINK and *FLAGS in config.tests find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \ - sed -i -e "/bin\/qmake/ s: \"QT_BUILD_TREE=: \ + sed -i -e "/bin\/qmake/ s: \"\$SRCDIR/: \ 'QMAKE_CC=$(tc-getCC)' 'QMAKE_CXX=$(tc-getCXX)' 'QMAKE_LINK=$(tc-getCXX)' \ 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}' 'QMAKE_LFLAGS+=${LDFLAGS}'&:" \ || die "sed config.tests failed" |