diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-12-02 05:02:53 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-12-07 21:26:49 +1100 |
| commit | 241a0712deb4e10edaa70f6681490a97d49d5126 (patch) | |
| tree | 5f4668c8497968abadaeba37e1f24f77c44552c9 | |
| parent | dev-qt/qtwebengine: Add patches. (diff) | |
| download | qt-241a0712deb4e10edaa70f6681490a97d49d5126.tar.gz qt-241a0712deb4e10edaa70f6681490a97d49d5126.tar.bz2 qt-241a0712deb4e10edaa70f6681490a97d49d5126.zip | |
qt5-build.eclass: fix avoiding qmake recompilation for Qt 5.8 and later
See qtbase commit 4ce0beee1b69a8695fc24a244a8a3053711906ac.
| -rw-r--r-- | eclass/qt5-build.eclass | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 301cc17c..f97bd778 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -179,8 +179,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:): \ |