commit: 0b04528cc559c66f4fbebf0a0a605bd090e97944 Author: Jan Kundrát <jkt <AT> kde <DOT> org> AuthorDate: Fri Sep 22 14:16:55 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Sep 22 14:44:48 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0b04528c
qt5-build.eclass: adapt to changes in Qt 5.9 git A recent commit upstream [1] renamed some configure tests which resulted in a broken build. It seems that these sed invocations were effectively a no-op since at least [2] which apparently removed the last instance of qmake's `-nocache` argument. This seding was in place in the qt5-build.eclass since its very beginning. I believe that the explanatory comment does not effectively match what the code (might have been trying to) do. It seems that the real origin dates back to 2015 when it was added [3] to the qt4-build-multilib.eclass by @pesa. Given that this `sed` was not doing anything for the past year anyway and that nobody reported a bug about that AFAIK and that it started breaking the build, it is safe to remove it now. [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=b0060d1056d6d1752d91652261de97db909c7862 [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=d90db0f136d727f8e6b9a566eee3eae80cd7d81e [3] https://github.com/gentoo/gentoo-gitmig-20150809-draft/commit/265a3c916261b238bc12505a031d92225b1d7056 eclass/qt5-build.eclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index c0c5bda8..fa775d36 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -193,9 +193,11 @@ qt5-build_src_prepare() { sed -i -e "/^QMAKE_CONF_COMPILER=/ s:=.*:=\"$(tc-getCXX)\":" \ configure || die "sed failed (QMAKE_CONF_COMPILER)" - # Respect toolchain and flags in config.tests - find config.tests/unix -name '*.test' -type f -execdir \ - sed -i -e 's/-nocache //' '{}' + || die + if [[ ${QT5_MINOR_VERSION} -le 7 ]]; then + # Respect toolchain and flags in config.tests + find config.tests/unix -name '*.test' -type f -execdir \ + sed -i -e 's/-nocache //' '{}' + || die + fi # Don't inject -msse/-mavx/... into CXXFLAGS when detecting # compiler support for extended instruction sets (bug 552942)
