[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     94f2b4eba3289fc2bebcd90260767a5e3b493d3f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 18:02:53 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 01:46:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f2b4eb

qt5-build.eclass: fix avoiding qmake recompilation for Qt 5.8 and later

See qtbase commit 4ce0beee1b69a8695fc24a244a8a3053711906ac.

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

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index a627ce882a4..62c79d09628 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -172,8 +172,14 @@ qt5-build_src_prepare() {
                qt5_symlink_tools_to_build_dir
 
                # Avoid unnecessary qmake recompilations
-               sed -i -re "s|^if true;.*(\[ 
'\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
-                       configure || die "sed failed (skip qmake bootstrap)"
+               if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then
+                       sed -i -e "/Creating qmake/i if [ '!' -e 
\"\$outpath/bin/qmake\" ]; then" \
+                               -e '/echo "Done."/a fi' \
+                               configure || die "sed failed (skip qmake 
bootstrap)"
+               else
+                       sed -i -re "s|^if true;.*(\[ 
'\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \
+                               configure || die "sed failed (skip qmake 
bootstrap)"
+               fi
 
                # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when 
bootstrapping qmake
                sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \