[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     12f4fabfaca9bd4c0f62d8ba0b9731840eff588e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 19:58:11 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 19:58:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=12f4fabf

qt5-build.eclass: rewrite sed so that it works on 5.6 and 5.7 too

 eclass/qt5-build.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 4260c20..0a54bed 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -188,12 +188,12 @@ qt5-build_src_prepare() {
                sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \
                        ${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 
'CXX=$(tc-getCXX)' \
                        'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 
'QMAKE_LFLAGS=${LDFLAGS}'&:" \
-                       -e '/"$CFG_RELEASE_QMAKE"/,/^\s\+fi$/ d' \
+                       -e 
's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/'
 \
                        configure || die "sed failed (respect env for qmake 
build)"
                sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \
                        qmake/Makefile.unix || die "sed failed (CPPFLAGS for 
qmake build)"
 
-               # Respect CXX in {bsymbolic_functions,fvisibility,precomp}.test
+               # Respect CXX in bsymbolic_functions, fvisibility, precomp, and 
a few other tests
                sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \
                        configure || die "sed failed (QMAKE_CONF_COMPILER)"