From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-722960-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id C44A213877A
for <garchives@archives.gentoo.org>; Fri, 15 Aug 2014 01:53:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4630EE08E2;
Fri, 15 Aug 2014 01:53:48 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9B9DBE08E5
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Aug 2014 01:53:47 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 87E0134007C
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Aug 2014 01:53:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id A11EE1881D
for <gentoo-commits@lists.gentoo.org>; Fri, 15 Aug 2014 01:53:43 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
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" <pesa@gentoo.org>
Message-ID: <1408066938.212df0a5584a53a6c0f15a1079bae40bccb89a63.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: 212df0a5584a53a6c0f15a1079bae40bccb89a63
X-VCS-Branch: master
Date: Fri, 15 Aug 2014 01:53:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7da5b8f6-35e9-4b33-a480-8d55c254efc4
X-Archives-Hash: d2cb8fd121a8dc1feca6276e739ff579
Message-ID: <20140815015343.G5RyLQVcKBgFj8GGrHuRB3S51-LW8sNKmn6GvlAFru8@z>
commit: 212df0a5584a53a6c0f15a1079bae40bccb89a63
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 15 01:42:18 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 01:42:18 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=212df0a5
[qt5-build.eclass] Remove useless sed.
The intent of these two expressions was to give precedence to
the user's CXXFLAGS/LDFLAGS over those passed by the configure
on the command line. However the user's flags are stored in
.qmake.cache, which is read before processing command line
variables anyway, thus there's no point in changing the order.
Some other solution is needed.
---
eclass/qt5-build.eclass | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 04800d3..9c2799c 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -189,10 +189,8 @@ qt5-build_src_prepare() {
configure || die "sed failed (QMAKE_CONF_COMPILER)"
# Respect toolchain and flags in config.tests
- find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
- sed -ri -e '/CXXFLAGS=/ s/"(\$CXXFLAGS) (\$PARAM)"/"\2 \1"/' \
- -e '/LFLAGS=/ s/"(\$LFLAGS) (\$PARAM)"/"\2 \1"/' \
- -e '/bin\/qmake/ s/-nocache //' \
+ find config.tests/unix -name '*.test' -type f -print0 \
+ | xargs -0 sed -i -e '/bin\/qmake/ s/-nocache //' \
|| die "sed failed (config.tests)"
fi