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 4462513829C for ; Sun, 12 Jun 2016 22:58:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9966E0952; Sun, 12 Jun 2016 22:58:03 +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 99DB8E0952 for ; Sun, 12 Jun 2016 22:58:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1FF47340A38 for ; Sun, 12 Jun 2016 22:58:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5480C334 for ; Sun, 12 Jun 2016 22:57:58 +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: <1465772080.2de743381e9955e221fc09c4be521886ecd31788.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: 2de743381e9955e221fc09c4be521886ecd31788 X-VCS-Branch: master Date: Sun, 12 Jun 2016 22:57:58 +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: 81599f07-72a1-411c-9b06-cde50690e428 X-Archives-Hash: ac9661585982ac1a784e8a6a78f2a3f8 commit: 2de743381e9955e221fc09c4be521886ecd31788 Author: Davide Pesavento gentoo org> AuthorDate: Sun Jun 12 22:53:57 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Jun 12 22:54:40 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2de74338 qt5-build.eclass: tweak sed expression to also apply to 5.6.1 and later See qtbase commit 394a02624105082c9ac440711c8a98bf75b830f3 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 9b1a4ab..5c3acd8 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 -re '/(bin\/qmake|QMAKE")/ s/-nocache //' '{}' + || die + sed -i -e 's/-nocache //' '{}' + || die # Don't inject -msse/-mavx/... into CXXFLAGS when detecting # compiler support for extended instruction sets (bug 552942)