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 EA46459CA3 for ; Sun, 13 Mar 2016 20:28:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AADDB21C01F; Sun, 13 Mar 2016 20:28:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B99121C01F for ; Sun, 13 Mar 2016 20:28:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F301F34016B for ; Sun, 13 Mar 2016 20:28:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47410823 for ; Sun, 13 Mar 2016 20:28:52 +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: <1457900881.ab4ed663cee3126d99e6638a0607531d589194be.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: ab4ed663cee3126d99e6638a0607531d589194be X-VCS-Branch: master Date: Sun, 13 Mar 2016 20:28:52 +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: 0e234d05-fef1-42f2-ac00-a17ef7723058 X-Archives-Hash: ed056b0c79537ee378dfe5291b06d4f5 commit: ab4ed663cee3126d99e6638a0607531d589194be Author: Davide Pesavento gentoo org> AuthorDate: Sun Mar 13 20:28:01 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Mar 13 20:28:01 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=ab4ed663 qt5-build.eclass: tweak sed to apply to 5.7's config.tests eclass/qt5-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 0a54bed..31a5b65 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -199,7 +199,7 @@ qt5-build_src_prepare() { # Respect toolchain and flags in config.tests find config.tests/unix -name '*.test' -type f -execdir \ - sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + || die + sed -i -re '/(bin\/qmake|QMAKE")/ s/-nocache //' '{}' + || die # Don't add -O3 to CXXFLAGS (bug 549140) sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \