summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2012-12-22 03:57:14 +0000
committerDavide Pesavento <pesa@gentoo.org>2012-12-22 03:57:14 +0000
commit0de439c73585f02c3d0e1deb229c895fc74ee245 (patch)
treefb7c6ecccf743f31e269f84061e82d7c90437458 /eclass
parentBug #439188: Absolutely ridiculous workaround for upstream glibc/kernel heade... (diff)
downloadhistorical-0de439c73585f02c3d0e1deb229c895fc74ee245.tar.gz
historical-0de439c73585f02c3d0e1deb229c895fc74ee245.tar.bz2
historical-0de439c73585f02c3d0e1deb229c895fc74ee245.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/ChangeLog6
-rw-r--r--eclass/qt4-build.eclass4
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"