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 0AFB91381F3 for ; Sat, 22 Dec 2012 03:34:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C82AA21C040; Sat, 22 Dec 2012 03:34:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFFFC21C028 for ; Sat, 22 Dec 2012 03:34:41 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D920733D926 for ; Sat, 22 Dec 2012 03:34:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 79BC5E5448 for ; Sat, 22 Dec 2012 03:34:39 +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: <1356147108.3ae74b4dd12500aed5d229e6da9736e3a4c8807d.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 3ae74b4dd12500aed5d229e6da9736e3a4c8807d X-VCS-Branch: master Date: Sat, 22 Dec 2012 03:34:39 +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: 306dfc70-2610-43e8-baf9-34d8ec327082 X-Archives-Hash: 2df5507f758a9961880455abdd7ccd41 commit: 3ae74b4dd12500aed5d229e6da9736e3a4c8807d Author: Davide Pesavento gmail com> AuthorDate: Sat Dec 22 03:31:48 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Dec 22 03:31:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3ae74b4d [qt4-build.eclass] Tweak sed to match against Qt 4.8.4 too. Thanks to Tomasz Mloduchowski qdot.me> for spotting the regression. --- eclass/qt4-build.eclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index b584cf1..27d51a7 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -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"