diff options
| author |   Jan Kundrát <jkt@kde.org> | 2017-09-23 00:16:55 +1000 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2017-10-08 12:46:25 +1100 |
| commit | 7ff031743e217db3f65d4a8e91cde3549e4151da (patch) | |
| tree | 2dfb9e36ebc338df5fe8cb6bb963d8a0f11c070b /eclass/qt5-build.eclass | |
| parent | qt5-build.eclass: handle live minor versions >=10 (diff) | |
| download | gentoo-7ff031743e217db3f65d4a8e91cde3549e4151da.tar.gz gentoo-7ff031743e217db3f65d4a8e91cde3549e4151da.tar.bz2 gentoo-7ff031743e217db3f65d4a8e91cde3549e4151da.zip | |
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
Diffstat (limited to 'eclass/qt5-build.eclass')
| -rw-r--r-- | eclass/qt5-build.eclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index bd48b38ed841..5307d27a2932 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -194,9 +194,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) |