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
